From d6d06ff5c2ea0fa44becc5ef4340e5f2f15073e4 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Mon, 19 May 2008 09:15:05 +0800 Subject: [EXPAND] Fixed non-leading slash treatment in expmeta MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Back in January an attempt was made to fix the interpretation of quoted slashes in expmeta. However, this only fixed those cases where the quoted slash is at the front of the word. The case of non-leading slashes caused the previous directory part to gain a back slash suffix which causes subsequent pattern matches to fail. This patch fixes this by removing the back slash in that case. Thanks to Romain Tartière fox reporting this bug. Test case: echo /*"/null" Old result: /*/null New result: /dev/null Signed-off-by: Herbert Xu --- src/expand.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/expand.c') diff --git a/src/expand.c b/src/expand.c index 2c52781..e4c4c8b 100644 --- a/src/expand.c +++ b/src/expand.c @@ -1269,10 +1269,11 @@ expmeta(char *enddir, char *name) struct dirent *dp; int atend; int matchdot; + int esc; metaflag = 0; start = name; - for (p = name; *p; p++) { + for (p = name; esc = 0, *p; p += esc + 1) { if (*p == '*' || *p == '?') metaflag = 1; else if (*p == '[') { @@ -1291,11 +1292,11 @@ expmeta(char *enddir, char *name) } } else { if (*p == '\\') - p++; - if (*p == '/') { + esc++; + if (p[esc] == '/') { if (metaflag) break; - start = p + 1; + start = p + esc + 1; } } } @@ -1337,7 +1338,8 @@ expmeta(char *enddir, char *name) atend = 1; } else { atend = 0; - *endname++ = '\0'; + *endname = '\0'; + endname += esc + 1; } matchdot = 0; p = start; @@ -1363,7 +1365,7 @@ expmeta(char *enddir, char *name) } closedir(dirp); if (! atend) - endname[-1] = '/'; + endname[-esc - 1] = esc ? '\\' : '/'; } #endif /* HAVE_GLOB */ -- cgit 1.4.1