From a027f4410a23cadee78e4c04f319df20b07567cb Mon Sep 17 00:00:00 2001 From: hobbs Date: Wed, 5 Oct 2005 00:38:04 +0000 Subject: * tests/winFile.test (getuser): allow valid Windows usernames. [Bug 1311285] --- ChangeLog | 7 +++++-- tests/winFile.test | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1464a38..6eb81f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2005-10-04 Jeff Hobbs + * tests/winFile.test (getuser): allow valid Windows usernames. + [Bug 1311285] + * generic/tclParse.c (Tcl_ParseCommand): add code that recognizes {} in addition to {expand} for word expansion (make with -DALLOW_EMPTY_EXPAND). @@ -25,8 +28,8 @@ 2005-09-30 Don Porter - * generic/tclMain.c: Separate encoding conversion of command line - arguments from list formatting. [Bug 1306162]. + * generic/tclMain.c: Separate encoding conversion of command line + arguments from list formatting. [Bug 1306162]. 2005-09-29 Jeff Hobbs diff --git a/tests/winFile.test b/tests/winFile.test index ffbb776..b8837db 100644 --- a/tests/winFile.test +++ b/tests/winFile.test @@ -10,7 +10,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: winFile.test,v 1.16 2004/11/08 19:19:27 davygrvy Exp $ +# RCS: @(#) $Id: winFile.test,v 1.17 2005/10/05 00:38:05 hobbs Exp $ if {[catch {package require tcltest 2.0.2}]} { puts stderr "Skipping tests in [info script]. tcltest 2.0.2 required." @@ -112,7 +112,7 @@ proc getuser {fname} { if {[string match -nocase "* $tail" $line]} { set attrs [string range $line \ 0 end-[string length $tail]] - regexp { [A-Z]+\\.*$} $attrs owner + regexp { [^ \\]+\\.*$} $attrs owner set owner [string trim $owner] } } -- cgit v0.12