diff options
| author | dgp <dgp@users.sourceforge.net> | 2006-10-02 18:30:36 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2006-10-02 18:30:36 (GMT) |
| commit | ac2ac6ed4da799137f85349b51ca4f209246df80 (patch) | |
| tree | 4a2197bb80a84e3bd3d16218835d0563ace47eca /generic/tclFileName.c | |
| parent | 4e20b55798ba3cb9b6bc3c9d02b3ba4790efa387 (diff) | |
| download | tcl-ac2ac6ed4da799137f85349b51ca4f209246df80.zip tcl-ac2ac6ed4da799137f85349b51ca4f209246df80.tar.gz tcl-ac2ac6ed4da799137f85349b51ca4f209246df80.tar.bz2 | |
* generic/tclFileName.c (TclGlob): Prevent doubling of directory
separators by [glob]. [Bug 1569042]
Diffstat (limited to 'generic/tclFileName.c')
| -rw-r--r-- | generic/tclFileName.c | 6 |
1 files changed, 5 insertions, 1 deletions
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++; } |