From bd9ced628bb8621babc1d677669c14277845745d Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sun, 25 May 2014 22:17:25 +0100 Subject: [PATCH] rename: allow renaming in subdirectories Earlier the rename(1) considered path as possible string to be renamed, could lead to an issue with none existing destination. See below for demonstration of this issue. After this change all directory elements are ignored when the match finding happens. $ cd $(mktemp -d) $ mkdir aa ab $ touch a{a,b}/aa $ rename -v a x */aa rename: aa/aa: rename to xa/aa failed: No such file or directory Signed-off-by: Sami Kerola --- misc-utils/rename.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/misc-utils/rename.c b/misc-utils/rename.c index 9db85fb1d0..b945aaab70 100644 --- a/misc-utils/rename.c +++ b/misc-utils/rename.c @@ -46,9 +46,14 @@ static int do_rename(char *from, char *to, char *s, int verbose, int symtarget) target[sb.st_size] = '\0'; where = strstr(target, from); - } else - where = strstr(s, from); + } else { + char *file; + file = rindex(s, '/'); + if (file == NULL) + file = s; + where = strstr(file, from); + } if (where == NULL) { free(target); return 0; -- 2.47.2