commit bash-20070927 snapshot

diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index 292ac7fa0bc82580b3f91dcd205707d714846312..e868b90180f82922421efd8bbe2c6def68c20002 100644 (file)
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -14900,3 +14900,17 @@ builtins/common.c
        - add code to retry fork() after EAGAIN, with a progressively longer
          sleep between attempts, up to FORKSLEEP_MAX (16) seconds.  Suggested
          by Martin Koeppe <mkoeppe@gmx.de>
+
+                                  9/21
+                                  ----
+version.c
+       - change copyright year to 2007
+
+                                  9/25
+                                  ----
+pathexp.c
+       - change quote_string_for_globbing to add a backslash in front of a
+         backslash appearing in the pathname string, since the globbing
+         code will interpret backslashes as quoting characters internally.
+         Bug reported by <herbert@gondor.apana.org.au> on the debian list
+         (443685)

diff --git a/pathexp.c b/pathexp.c
index 69966ac4331bbc2f7d431341d8996b548ac46563..b2305e038ccebc46ab24611504a5d36a93e79067 100644 (file)
--- a/pathexp.c
+++ b/pathexp.c
@@ -176,6 +176,13 @@ quote_string_for_globbing (pathname, qflags)
          if (pathname[i] == '\0')
            break;
        }
+      else if (pathname[i] == '\\')
+       {
+         temp[j++] = '\\';
+         i++;
+         if (pathname[i] == '\0')
+           break;
+       }
       temp[j++] = pathname[i];
     }
   temp[j] = '\0';