summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2010-09-02 18:31:00 (GMT)
committerandreas_kupries <akupries@shaw.ca>2010-09-02 18:31:00 (GMT)
commit5f0443404189f50df5bed4923c57dfd2ba22c28c (patch)
treedc1607e422ae75cd5d0878952ced49cf8b3eab2d
parent364f13006382f8f84f235b29cb953ac4348d57f9 (diff)
downloadtcl-5f0443404189f50df5bed4923c57dfd2ba22c28c.zip
tcl-5f0443404189f50df5bed4923c57dfd2ba22c28c.tar.gz
tcl-5f0443404189f50df5bed4923c57dfd2ba22c28c.tar.bz2
* library/safe.tcl (::safe::AliasGlob): Fixed another problem, the
option -join does not stop option processing in the core builtin, so the emulation must not do that either.
-rw-r--r--ChangeLog6
-rw-r--r--library/safe.tcl4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d5d1d7c..2e3d634 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-02 Andreas Kupries <andreask@activestate.com>
+
+ * library/safe.tcl (::safe::AliasGlob): Fixed another problem, the
+ option -join does not stop option processing in the core builtin,
+ so the emulation must not do that either.
+
2010-09-01 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* library/safe.tcl (::safe::AliasGlob): Moved the command
diff --git a/library/safe.tcl b/library/safe.tcl
index 27f9d92..0cae5fd 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -12,7 +12,7 @@
# See the file "license.terms" for information on usage and redistribution of
# this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: safe.tcl,v 1.40 2010/09/02 04:53:34 andreas_kupries Exp $
+# RCS: @(#) $Id: safe.tcl,v 1.41 2010/09/02 18:31:00 andreas_kupries Exp $
#
# The implementation is based on namespaces. These naming conventions are
@@ -724,7 +724,7 @@ proc ::safe::AliasGlob {slave args} {
break
}
}
- if {$got(--) || $got(-join)} break
+ if {$got(--)} break
}
# Get the real path from the virtual one and check that the path is in the