diff options
| author | vincentdarley <vincentdarley> | 2004-03-09 12:56:58 (GMT) |
|---|---|---|
| committer | vincentdarley <vincentdarley> | 2004-03-09 12:56:58 (GMT) |
| commit | 83bd3562c6dc32727b2daf5144e64cf1e1b09780 (patch) | |
| tree | 25c90b5ff17b1204c2f0cf40451ab799d7fd034a | |
| parent | bf3eeadcf5c24c56e019e7fe8b20244da6cb05ee (diff) | |
| download | tcl-83bd3562c6dc32727b2daf5144e64cf1e1b09780.zip tcl-83bd3562c6dc32727b2daf5144e64cf1e1b09780.tar.gz tcl-83bd3562c6dc32727b2daf5144e64cf1e1b09780.tar.bz2 | |
glob -path fix for near filesystem root
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | generic/tclFileName.c | 12 | ||||
| -rw-r--r-- | tests/fileName.test | 33 |
3 files changed, 48 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2004-03-08 Vince Darley <vincentdarley@users.sourceforge.net> + + * generic/tclFileName.c: Fix to 'glob -path' near the root + * tests/fileName.test: of the filesystem. [Bug 910525] + 2004-03-01 Don Porter <dgp@users.sourceforge.net> *** 8.4.6 TAGGED FOR RELEASE *** diff --git a/generic/tclFileName.c b/generic/tclFileName.c index bc314cf..7fbfb7f 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.6 2004/01/13 17:26:42 dgp Exp $ + * RCS: @(#) $Id: tclFileName.c,v 1.40.2.7 2004/03/09 12:56:59 vincentdarley Exp $ */ #include "tclInt.h" @@ -1717,6 +1717,16 @@ Tcl_GlobObjCmd(dummy, interp, objc, objv) /* Have to split off the end */ Tcl_DStringAppend(&pref, last, first+pathlength-last); pathOrDir = Tcl_NewStringObj(first, last-first-1); + /* + * We must ensure that we haven't cut off too much, + * and turned a valid path like '/' or 'C:/' into + * an incorrect path like '' or 'C:'. The way we + * do this is to add a separator if there are none + * presently in the prefix. + */ + if (strpbrk(Tcl_GetString(pathOrDir), "\\/") == NULL) { + Tcl_AppendToObj(pathOrDir, last-1, 1); + } } /* Need to quote 'prefix' */ Tcl_DStringInit(&prefix); diff --git a/tests/fileName.test b/tests/fileName.test index 830618b..db431fc 100644 --- a/tests/fileName.test +++ b/tests/fileName.test @@ -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: fileName.test,v 1.30.2.3 2003/10/06 09:49:20 vincentdarley Exp $ +# RCS: @(#) $Id: fileName.test,v 1.30.2.4 2004/03/09 12:56:59 vincentdarley Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -1648,6 +1648,37 @@ test filename-12.5 {simple globbing} { test filename-12.6 {simple globbing} { list [catch {glob globTest\\/\\x1.c} msg] $msg } "0 $globPreResult$x1" +test filename-12.7 {globbing at filesystem root} {unixOnly} { + set res1 [glob -nocomplain /*] + set res2 [glob -path / *] + set equal [string equal $res1 $res2] + if {!$equal} { + lappend equal "not equal" $res1 $res2 + } + set equal +} {1} +test filename-12.8 {globbing at filesystem root} {unixOnly} { + set dir [lindex [glob -type d /*] 0] + set first [string range $dir 0 1] + set res1 [glob -nocomplain ${first}*] + set res2 [glob -path $first *] + set equal [string equal $res1 $res2] + if {!$equal} { + lappend equal "not equal" $res1 $res2 + } + set equal +} {1} +test filename-12.9 {globbing at filesystem root} {winOnly} { + set dir [lindex [glob -type d [lindex [file volumes] 0]*] 0] + set first [string range $dir 0 3] + set res1 [glob -nocomplain ${first}*] + set res2 [glob -path $first *] + set equal [string equal $res1 $res2] + if {!$equal} { + lappend equal "not equal" $res1 $res2 + } + set equal +} {1} test filename-13.1 {globbing with brace substitution} { list [catch {glob globTest/\{\}} msg] $msg |