From 66e4e9242b23645c56155af0ff8ada659966ddde Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 29 Mar 2010 10:57:56 +0200 Subject: hush: only remove backslashes introduced from glob Signed-off-by: Sascha Hauer --- common/hush.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/hush.c b/common/hush.c index 6a8b56be..afa67d16 100644 --- a/common/hush.c +++ b/common/hush.c @@ -779,8 +779,9 @@ static int globhack(const char *src, int flags, glob_t *pglob) int cnt=0, pathc; const char *s; char *dest; + for (cnt=1, s=src; s && *s; s++) { - if (*s == '\\') s++; + if (*s == '\\' && strchr("*[?", *(s + 1))) s++; cnt++; } dest = xmalloc(cnt); @@ -794,7 +795,7 @@ static int globhack(const char *src, int flags, glob_t *pglob) pglob->gl_pathv[pathc-1] = dest; pglob->gl_pathv[pathc] = NULL; for (s=src; s && *s; s++, dest++) { - if (*s == '\\') s++; + if (*s == '\\' && strchr("*[?", *(s + 1))) s++; *dest = *s; } *dest='\0'; -- cgit v1.2.3