summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2010-09-02 18:30:28 (GMT)
committerandreas_kupries <akupries@shaw.ca>2010-09-02 18:30:28 (GMT)
commit37b5a07a958d560a4ec376cc8198efd66cdf82ba (patch)
treecaa69df2be26741c570a0a01b1513e855e49f65e
parent3ee8203e9c261e8e6dd85d85ec06531022995b9b (diff)
downloadtcl-37b5a07a958d560a4ec376cc8198efd66cdf82ba.zip
tcl-37b5a07a958d560a4ec376cc8198efd66cdf82ba.tar.gz
tcl-37b5a07a958d560a4ec376cc8198efd66cdf82ba.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 9fea464..feafe59 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>
*** 8.5.9 TAGGED FOR RELEASE ***
diff --git a/library/safe.tcl b/library/safe.tcl
index 7b4a50d..6a2cdbe 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.16.4.7 2010/09/02 04:52:49 andreas_kupries Exp $
+# RCS: @(#) $Id: safe.tcl,v 1.16.4.8 2010/09/02 18:30:29 andreas_kupries Exp $
#
# The implementation is based on namespaces. These naming conventions are
@@ -715,7 +715,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