From 25ba8f306f3099caf8397859019e936b90510e8d Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Tue, 18 Apr 2000 23:16:56 +0000
Subject: [PATCH] * dcrt0.cc (globify): Don't use \ quoting when apparently
quoting a DOS path spec, even within a quoted string.
---
winsup/cygwin/ChangeLog | 4 ++--
winsup/cygwin/dcrt0.cc | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index abe54a630..80eb566dd 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,7 +1,7 @@
-Tue Apr 18 17:26:43 2000 Christopher Faylor <cgf@cygnus.com>
+Tue Apr 18 19:15:29 2000 Christopher Faylor <cgf@cygnus.com>
* dcrt0.cc (globify): Don't use \ quoting when apparently quoting a DOS
- path spec.
+ path spec, even within a quoted string.
Sun Apr 16 18:54:21 2000 Christopher Faylor <cgf@cygnus.com>
diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc
index 5f0ad4958..76a5015f0 100644
--- a/winsup/cygwin/dcrt0.cc
+++ b/winsup/cygwin/dcrt0.cc
@@ -332,10 +332,8 @@ globify (char *word, char **&argv, int &argc, int &argvlen)
char quote = *s;
while (*++s && *s != quote)
{
- if (*s != '\\')
+ if (dos_spec || *s != '\\')
/* nothing */;
- else if (dos_spec)
- *p++ = '\\';
else if (s[1] == quote || s[1] == '\\')
s++;
*p++ = '\\';