summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-08-26 13:46:37 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-08-26 13:46:37 (GMT)
commita6063330c474dde9b388bfeda1b1bb746aebf23a (patch)
tree4432e6fc498d08f58e7cbc0ea55a86f5f3c1df8c
parent2119f5dcbf026df83d8e30b7cb7648f296cb3c5f (diff)
downloadtcl-a6063330c474dde9b388bfeda1b1bb746aebf23a.zip
tcl-a6063330c474dde9b388bfeda1b1bb746aebf23a.tar.gz
tcl-a6063330c474dde9b388bfeda1b1bb746aebf23a.tar.bz2
Merge dup-removal into search loop so we avoid pre-processing efforts on
data that are never used. Contributed patch from Brian Griffin.
-rw-r--r--library/auto.tcl11
1 files changed, 3 insertions, 8 deletions
diff --git a/library/auto.tcl b/library/auto.tcl
index 02edcc4..97ea8af 100644
--- a/library/auto.tcl
+++ b/library/auto.tcl
@@ -122,11 +122,9 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
# uniquify $dirs in order
array set seen {}
foreach i $dirs {
- # Take note that the [file normalize] below has been noted to cause
- # difficulties for the freewrap utility. See Bug 1072136. Until
- # freewrap resolves the matter, one might work around the problem by
- # disabling that branch.
+ # Make sure $i is unique under normalization. Avoid repeated [source].
if {[interp issafe]} {
+ # Safe interps have no [file normalize].
set norm $i
} else {
set norm [file normalize $i]
@@ -135,10 +133,7 @@ proc tcl_findLibrary {basename version patch initScript enVarName varName} {
continue
}
set seen($norm) {}
- lappend uniqdirs $i
- }
- set dirs $uniqdirs
- foreach i $dirs {
+
set the_library $i
set file [file join $i $initScript]