Missed a few spots with the previous checkin. Now only

tools/tcltk-man2html.tcl is left unfixed, but that file is sufficiently
complex that I don't dare touch it without understanding exactly what all
of the supposed directory separators are doing there.  In any case, this
file is probably not going to be used by ordinary users; developers can put
up with a few more "pointless restrictions"...

4 files changed, 36 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 4a98484..cf5d077 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,22 +1,26 @@
 2000-11-24  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
+	* library/tcltest/tcltest.tcl (getMatchingFiles,
+	  getMatchingDirectories):
+	* tools/man2html.tcl (doDir): 
+	* tools/man2help.tcl (doDir): 
 	* library/package.tcl (tclPkgUnknown,tclMacPkgSearch): 
 	* library/safe.tcl (AddSubDirs): [glob] uses -directory instead of
-	unsafe [file join] to fix Bug #123313
+	  unsafe [file join] to fix Bug #123313
 
 	* generic/tclIndexObj.c:
 	* generic/tclTestObj.c (TestindexobjCmd): Changed internal
-	representation of index objects to fix Bug #119082; fix shouldn't
-	be visible to outside world...
+	  representation of index objects to fix Bug #119082; fix
+	  shouldn't be visible to outside world...
 
 	* generic/tclTest.c (TestGetIndexFromObjStructObjCmd): 
 	* tests/indexObj.test: (indexObj-6.*) Added to test for presence
-	of Bug #119082.
+	  of Bug #119082.
 
 2000-11-23  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
 	* generic/tclCmdIL.c (Tcl_LsortObjCmd): Fixed memory leak from Bug
-	#119398
+	  #119398
 
 	* library/init.tcl (unknown): Added specific level parameters to
 	  all uplevel invokations to boost performance; didn't dare touch
@@ -82,21 +86,22 @@
 	* doc/global.n: 
 	* doc/upvar.n: 
 	* doc/variable.n: Improved documentation to mention that variables
-	so created are listed in [info locals] and added a few more
-	cross-links between these commands.  Fixes bug #119387
+	  so created are listed in [info locals] and added a few more
+	  cross-links between these commands.  Fixes bug #119387
 
 2000-11-17  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
 	* tests/safe.test: (safe-4.3):
 	* generic/tclVar.c (TclLookupVar): Changed again.  Now passes all
-	the tests, though one needed modifying since it required the wrong
-	answer.  (Why on earth do we have inline modification of argument
-	strings?  This sort of thing is horrendous to debug and doesn't
-	work well in a multithreaded environment!)  Fixes bug 119192.
+	  the tests, though one needed modifying since it required the
+	  wrong answer.  (Why on earth do we have inline modification of
+	  argument strings?  This sort of thing is horrendous to debug and
+	  doesn't work well in a multithreaded environment!)  Fixes bug
+	  119192.
 
 	* tests/var.test: (var-1.19) If my attempts to fix the problem
-	aren't right yet, my attempts to describe it look pretty good to
-	me...
+	  aren't right yet, my attempts to describe it look pretty good to
+	  me...
 
 2000-11-16  Andreas Kupries  <a.kupries@westend.com>
 
@@ -109,25 +114,26 @@
 2000-11-15  jeff hobbs  <jeff.hobbs@acm.org>
 
 	* unix/Makefile.in: removed bp.c references (hasn't existed in a
-	long time).  Corrected 'make dist' to make dist with unversioned
-	library directories (same as out of cvs), so make install works
-	correctly with either source tree.
+	  long time).  Corrected 'make dist' to make dist with unversioned
+	  library directories (same as out of cvs), so make install works
+	  correctly with either source tree.
 
 2000-11-15  jeff hobbs  <jeff.hobbs@acm.org>
 
 	* generic/tclVar.c (TclLookupVar): reverted fix below as it broke
-	all other array unset error reporting.  Bug-119192 is still open.
+	  all other array unset error reporting.  Bug-119192 is still
+	  open.
 
 2000-11-15  Donal K. Fellows  <fellowsd@cs.man.ac.uk>
 
 	* generic/tclVar.c (TclLookupVar): Changed references to part2 to
-	use elName instead in various error message generating spots, so
-	as to fix Bug-119192.
+	  use elName instead in various error message generating spots, so
+	  as to fix Bug-119192.
 
 2000-11-03  David Gravereaux  <davygrvy@ajubasolutions.com>
 
 	* win/.cvsignore: Removed 'configure' from the glob list now
-	that it's included.
+	  that it's included.
 
 2000-11-03  Jeff Hobbs  <hobbs@ajubasolutions.com>
 
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index c58c0da..cb3d405 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -13,7 +13,7 @@
 # Copyright (c) 2000 by Ajuba Solutions
 # All rights reserved.
 # 
-# RCS: @(#) $Id: tcltest.tcl,v 1.29 2000/10/28 00:00:00 jenn Exp $
+# RCS: @(#) $Id: tcltest.tcl,v 1.30 2000/11/24 14:17:11 dkf Exp $
 
 # create the "tcltest" namespace for all testing variables and procedures
 
@@ -2836,13 +2836,13 @@ proc tcltest::getMatchingFiles { {searchDirectory ""} } {
 	set matchFileList {}
 	foreach match $tcltest::matchFiles {
 	    set matchFileList [concat $matchFileList \
-		    [glob -nocomplain [file join $directory $match]]]
+		    [glob -directory $directory -nocomplain -- $match]]
 	}
 	if {[string compare {} $tcltest::skipFiles]} {
 	    set skipFileList {}
 	    foreach skip $tcltest::skipFiles {
 		set skipFileList [concat $skipFileList \
-			[glob -nocomplain [file join $directory $skip]]]
+			[glob -directory $directory -nocomplain -- $skip]]
 	    }
 	    foreach file $matchFileList {
 		# Only include files that don't match the skip pattern and
@@ -2887,7 +2887,7 @@ proc tcltest::getMatchingDirectories {rootdir} {
     # Find the matching directories in tcltest::testsDirectory and then
     # remove the ones that match the skip pattern
     foreach match $tcltest::matchDirectories {
-	foreach file [glob -nocomplain [file join $rootdir $match]] {
+	foreach file [glob -directory $rootdir -nocomplain -- $match] {
 	    if {([file isdirectory $file]) && ($file != $rootdir)} {
 		set matchDirList [concat $matchDirList \
 			[tcltest::getMatchingDirectories $file]]
@@ -2901,8 +2901,7 @@ proc tcltest::getMatchingDirectories {rootdir} {
 	set skipDirs {} 
 	foreach skip $tcltest::skipDirectories {
 	    set skipDirs [concat $skipDirs \
-		    [glob -nocomplain [file join $tcltest::testsDirectory \
-			$skip]]]
+		[glob -nocomplain -directory $tcltest::testsDirectory $skip]]
 	}
 	foreach dir $matchDirList {
 	    # Only include directories that don't match the skip pattern
@@ -3477,8 +3476,7 @@ namespace eval tcltest {
 
     # Save the names of files that already exist in
     # the output directory.
-    foreach file [glob -nocomplain \
-	    [file join $tcltest::temporaryDirectory *]] {
+    foreach file [glob -nocomplain -directory $tcltest::temporaryDirectory *] {
 	lappend tcltest::filesExisted [file tail $file]
     }
 }
diff --git a/tools/man2help.tcl b/tools/man2help.tcl
index 60914a5..130fde2 100644
--- a/tools/man2help.tcl
+++ b/tools/man2help.tcl
@@ -6,7 +6,7 @@
 #
 # Copyright (c) 1996 by Sun Microsystems, Inc.
 #
-# RCS: @(#) $Id: man2help.tcl,v 1.6 1999/12/22 22:59:59 hobbs Exp $
+# RCS: @(#) $Id: man2help.tcl,v 1.7 2000/11/24 14:17:12 dkf Exp $
 # 
 
 #
@@ -98,7 +98,7 @@ proc doFile {file} {
 
 proc doDir dir {
     puts "Generating man pages for $dir..."
-    foreach f [lsort [glob [file join $dir *.\[13n\]]]] {
+    foreach f [lsort [glob -directory $dir "*.\[13n\]"]] {
 	do $f
     }
 }
@@ -116,7 +116,7 @@ set files {}
 foreach i [lrange $argv 2 end] {
     set i [file join $i]
     if {[file isdir $i]} {
-	foreach f [lsort [glob [file join $i *.\[13n\]]]] {
+	foreach f [lsort [glob -directory $i "*.\[13n\]"]] {
 	    lappend files $f
 	}
     } elseif {[file exists $i]} {
diff --git a/tools/man2html.tcl b/tools/man2html.tcl
index cb60887..6f44aaa 100644
--- a/tools/man2html.tcl
+++ b/tools/man2html.tcl
@@ -75,7 +75,7 @@ proc footer {packages} {
 # dir -			Name of the directory.
 
 proc doDir dir {
-    foreach f [lsort [glob $dir/*.\[13n\]]] {
+    foreach f [lsort [glob -directory $dir "*.\[13n\]"]] {
 	do $f	;# defined in man2html1.tcl & man2html2.tcl
     }
 }