summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorericm <ericm>2000-06-20 21:28:11 (GMT)
committerericm <ericm>2000-06-20 21:28:11 (GMT)
commite8c9c04e812a25ce08a60dfca669900fefebb75b (patch)
treee9a9f4c63619c63557eda76759fb838b2a2d7931
parent3eb9179c354793e398482a1a00b12e7c3ef645b9 (diff)
downloadtcl-e8c9c04e812a25ce08a60dfca669900fefebb75b.zip
tcl-e8c9c04e812a25ce08a60dfca669900fefebb75b.tar.gz
tcl-e8c9c04e812a25ce08a60dfca669900fefebb75b.tar.bz2
Applied patch from [Bug: 5922]
-rw-r--r--ChangeLog5
-rw-r--r--library/opt/optparse.tcl4
-rw-r--r--library/opt0.4/optparse.tcl4
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e82c8ef..7d7963e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-20 Eric Melski <ericm@ajubasolutions.com>
+
+ * library/opt0.4/optparse.tcl: Applied patch from [Bug: 5922], which
+ corrected an incorrect use of [string match].
+
2000-06-19 Eric Melski <ericm@scriptics.com>
* doc/RegExp.3: Replaced instances of "Tcl_GetRegExpInfo" with
diff --git a/library/opt/optparse.tcl b/library/opt/optparse.tcl
index 289a39a..eabb734 100644
--- a/library/opt/optparse.tcl
+++ b/library/opt/optparse.tcl
@@ -8,7 +8,7 @@
# on it. If your code does rely on this package you
# may directly incorporate this code into your application.
#
-# RCS: @(#) $Id: optparse.tcl,v 1.2 1999/04/16 00:47:18 stanton Exp $
+# RCS: @(#) $Id: optparse.tcl,v 1.3 2000/06/20 21:28:11 ericm Exp $
package provide opt 0.4.1
@@ -253,7 +253,7 @@ proc ::tcl::OptParse {desc arglist} {
# into local variable named "Args".
proc ::tcl::OptProc {name desc body} {
set namespace [uplevel namespace current];
- if { ([string match $name "::*"])
+ if { ([string match "::*" $name])
|| ([string compare $namespace "::"]==0)} {
# absolute name or global namespace, name is the key
set key $name;
diff --git a/library/opt0.4/optparse.tcl b/library/opt0.4/optparse.tcl
index 289a39a..eabb734 100644
--- a/library/opt0.4/optparse.tcl
+++ b/library/opt0.4/optparse.tcl
@@ -8,7 +8,7 @@
# on it. If your code does rely on this package you
# may directly incorporate this code into your application.
#
-# RCS: @(#) $Id: optparse.tcl,v 1.2 1999/04/16 00:47:18 stanton Exp $
+# RCS: @(#) $Id: optparse.tcl,v 1.3 2000/06/20 21:28:11 ericm Exp $
package provide opt 0.4.1
@@ -253,7 +253,7 @@ proc ::tcl::OptParse {desc arglist} {
# into local variable named "Args".
proc ::tcl::OptProc {name desc body} {
set namespace [uplevel namespace current];
- if { ([string match $name "::*"])
+ if { ([string match "::*" $name])
|| ([string compare $namespace "::"]==0)} {
# absolute name or global namespace, name is the key
set key $name;