diff options
| author | dgp <dgp@users.sourceforge.net> | 2009-08-21 19:03:20 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2009-08-21 19:03:20 (GMT) |
| commit | 836091ea9efae698840e779b54318c3955f4a999 (patch) | |
| tree | a40e37174aef71683df6e5c809ca1548087e4d27 | |
| parent | a2bdafd99ae6e5df62b2c941de3dd77949fa50b3 (diff) | |
| download | tcl-836091ea9efae698840e779b54318c3955f4a999.zip tcl-836091ea9efae698840e779b54318c3955f4a999.tar.gz tcl-836091ea9efae698840e779b54318c3955f4a999.tar.bz2 | |
* generic/tclFileName.c: Correct regression in [Bug 2837800] fix.
* tests/fileName.test:
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclFileName.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2009-08-21 Don Porter <dgp@users.sourceforge.net> + + * generic/tclFileName.c: Correct regression in [Bug 2837800] fix. + * tests/fileName.test: + 2009-08-20 Don Porter <dgp@users.sourceforge.net> * generic/tclFileName.c: Correct result from [glob */test] when * diff --git a/generic/tclFileName.c b/generic/tclFileName.c index b2d43b9..893f68c 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.86.2.3 2009/08/20 22:08:03 dgp Exp $ + * RCS: @(#) $Id: tclFileName.c,v 1.86.2.4 2009/08/21 19:03:20 dgp Exp $ */ #include "tclInt.h" @@ -2358,7 +2358,7 @@ DoGlob( for (i=0; result==TCL_OK && i<subdirc; i++) { Tcl_Obj *copy = NULL; - if (Tcl_GetString(subdirv[i])[0] == '~') { + if (pathPtr == NULL && Tcl_GetString(subdirv[i])[0] == '~') { Tcl_ListObjLength(NULL, matchesObj, &repair); copy = subdirv[i]; subdirv[i] = Tcl_NewStringObj("./", 2); |