summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclFileName.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 56ec2f5..010925f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-02 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tclFileName.c (TclGlob): Prevent doubling of directory
+ separators by [glob]. [Bug 1569042]
+
2006-10-01 Pat Thoyts <patthoyts@users.sourceforge.net>
* win/tclWinFile.c: Handle possible missing define.
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 7ed34f7..9dce822 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclFileName.c,v 1.40.2.13 2006/08/30 17:35:24 hobbs Exp $
+ * RCS: @(#) $Id: tclFileName.c,v 1.40.2.14 2006/10/02 18:30:40 dgp Exp $
*/
#include "tclInt.h"
@@ -2130,6 +2130,10 @@ TclGlob(interp, pattern, unquotedPrefix, globFlags, types)
*/
if (globFlags & TCL_GLOBMODE_DIR) {
Tcl_DStringAppend(&buffer,separators,1);
+ /* Try to borrow that separator from the tail */
+ if (*tail == *separators) {
+ tail++;
+ }
}
prefixLen++;
}