diff --git a/ChangeLog b/ChangeLog index 0a8e42b023..f3e3a34e27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat May 11 10:52:09 2002 Nobuyoshi Nakada + + * dir.c (glob_helper): remove escaping backslashes. + Fri May 10 19:00:47 2002 Nobuyoshi Nakada * parse.y (here_document): preserve line number begins here diff --git a/dir.c b/dir.c index 8ade5471c6..3df0c0c54a 100644 --- a/dir.c +++ b/dir.c @@ -637,7 +637,6 @@ static void remove_backslashes(p) char *p; { -#if defined DOSISH char *pend = p + strlen(p); char *t = p; @@ -648,7 +647,6 @@ remove_backslashes(p) *t++ = *p++; } *t = '\0'; -#endif } #ifndef S_ISDIR @@ -668,7 +666,11 @@ glob_helper(path, sub, flags, func, arg) p = sub ? sub : path; if (!has_magic(p, 0, flags)) { +#if defined DOSISH remove_backslashes(path); +#else + if (!(flags & FNM_NOESCAPE)) remove_backslashes(p); +#endif if (stat(path, &st) == 0) { (*func)(path, arg); }