diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-03-29 10:57:56 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-03-30 14:15:03 +0200 |
| commit | 66e4e9242b23645c56155af0ff8ada659966ddde (patch) | |
| tree | 6460171f786839a6757034d55cfb1400493754fb /common | |
| parent | a9ff0c8e8b720f1902a1e89444072e9469847a2f (diff) | |
| download | barebox-66e4e9242b23645c56155af0ff8ada659966ddde.tar.gz barebox-66e4e9242b23645c56155af0ff8ada659966ddde.tar.xz | |
hush: only remove backslashes introduced from glob
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/hush.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/common/hush.c b/common/hush.c index 6a8b56be4e..afa67d16f5 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'; |