summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2009-08-21 19:06:05 (GMT)
committerdgp <dgp@users.sourceforge.net>2009-08-21 19:06:05 (GMT)
commitb7d5c914b5af4512f6eabc9ae4e9b3c49003a59f (patch)
tree76bcfa1e545635b2cc5bc27678a064b9de414346 /generic
parentdbfa541f382588345c31954e7bee8d14b7c61764 (diff)
downloadtcl-b7d5c914b5af4512f6eabc9ae4e9b3c49003a59f.zip
tcl-b7d5c914b5af4512f6eabc9ae4e9b3c49003a59f.tar.gz
tcl-b7d5c914b5af4512f6eabc9ae4e9b3c49003a59f.tar.bz2
* generic/tclFileName.c: Correct regression in [Bug 2837800] fix.
* tests/fileName.test:
Diffstat (limited to 'generic')
-rw-r--r--generic/tclFileName.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index ad71008..1070c42 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.97 2009/08/20 22:09:45 dgp Exp $
+ * RCS: @(#) $Id: tclFileName.c,v 1.98 2009/08/21 19:06:06 dgp Exp $
*/
#include "tclInt.h"
@@ -2369,7 +2369,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);