summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreas_kupries <akupries@shaw.ca>2010-09-02 04:53:34 (GMT)
committerandreas_kupries <akupries@shaw.ca>2010-09-02 04:53:34 (GMT)
commit364f13006382f8f84f235b29cb953ac4348d57f9 (patch)
tree4667d29fe14427abc87796ef104b4063011766d8
parent9cfbf9b3c024db75159b03c1eb94a0bf0b9bfb10 (diff)
downloadtcl-364f13006382f8f84f235b29cb953ac4348d57f9.zip
tcl-364f13006382f8f84f235b29cb953ac4348d57f9.tar.gz
tcl-364f13006382f8f84f235b29cb953ac4348d57f9.tar.bz2
* library/safe.tcl (::safe::AliasGlob): Moved the command
extending the actual glob command with a -directory flag to when we actually have a proper untranslated path,
-rw-r--r--ChangeLog6
-rw-r--r--library/safe.tcl4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a2803c..d5d1d7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-01 Andreas Kupries <andreas_kupries@users.sourceforge.net>
+
+ * library/safe.tcl (::safe::AliasGlob): Moved the command
+ extending the actual glob command with a -directory flag to when
+ we actually have a proper untranslated path,
+
2010-09-01 Andreas Kupries <andreask@activestate.com>
* generic/tclExecute.c: [Bug 3057639]. Applied patch by Jeff to
diff --git a/library/safe.tcl b/library/safe.tcl
index 81b53b4..27f9d92 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.39 2010/08/18 13:31:55 dkf Exp $
+# RCS: @(#) $Id: safe.tcl,v 1.40 2010/09/02 04:53:34 andreas_kupries Exp $
#
# The implementation is based on namespaces. These naming conventions are
@@ -708,7 +708,6 @@ proc ::safe::AliasGlob {slave args} {
set got($opt) 1
set virtualdir [lindex $args [incr at]]
incr at
- lappend cmd -directory $dir
}
pkgIndex.tcl {
# Oops, this is globbing a subdirectory in regular package
@@ -742,6 +741,7 @@ proc ::safe::AliasGlob {slave args} {
}
return -code error "permission denied"
}
+ lappend cmd -directory $dir
}
# Apply the -join semantics ourselves