tests, docs

3 files changed, 23 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index a59743a..68cb5a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-15  Vince Darley  <vincentdarley@users.sourceforge.net>
+
+	* tests/winFCmd.test: renamed 'win2000' and 'notWin2000' to
+	more appropriate constraint names.
+	* win/tclWinFile.c: updated comments to reflect 07-11 changes.
+	
 2002-07-14  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclInt.h:	Removed declarations that duplicated entries
diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index 1da9133..7d1ae3b 100644
--- a/tests/winFCmd.test
+++ b/tests/winFCmd.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: winFCmd.test,v 1.16 2002/03/24 11:41:51 vincentdarley Exp $
+# RCS: @(#) $Id: winFCmd.test,v 1.17 2002/07/15 09:01:51 vincentdarley Exp $
 #
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -47,15 +47,15 @@ proc cleanup {args} {
 if {[string equal $tcl_platform(platform) "windows"]} {
     if {[string equal $tcl_platform(os) "Windows NT"] \
       && [string equal [string index $tcl_platform(osVersion) 0] "5"]} {
-	tcltest::testConstraint win2000 1
-	tcltest::testConstraint notWin2000 0
+	tcltest::testConstraint win2000orXP 1
+	tcltest::testConstraint winOlderThan2000 0
     } else {
-	tcltest::testConstraint win2000 0
-	tcltest::testConstraint notWin2000 1
+	tcltest::testConstraint win2000orXP 0
+	tcltest::testConstraint winOlderThan2000 1
     }
 } else {
-    tcltest::testConstraint win2000 0
-    tcltest::testConstraint notWin2000 0
+    tcltest::testConstraint win2000orXP 0
+    tcltest::testConstraint winOlderThan2000 0
 }
 
 set ::tcltest::testConstraints(cdrom) 0
@@ -202,11 +202,11 @@ test winFCmd-1.12 {TclpRenameFile: errno: EACCES} {pcOnly} {
     close $fd
     set msg
 } {1 EACCES}
-test winFCmd-1.13 {TclpRenameFile: errno: EACCES} {win2000} {
+test winFCmd-1.13 {TclpRenameFile: errno: EACCES} {win2000orXP} {
     cleanup
     list [catch {testfile mv nul tf1} msg] $msg
 } {1 EINVAL}
-test winFCmd-1.13.1 {TclpRenameFile: errno: EACCES} {notWin2000} {
+test winFCmd-1.13.1 {TclpRenameFile: errno: EACCES} {winOlderThan2000} {
     cleanup
     list [catch {testfile mv nul tf1} msg] $msg
 } {1 EACCES}
@@ -234,11 +234,11 @@ test winFCmd-1.18 {TclpRenameFile: srcAttr == -1} {pcOnly} {
     cleanup
     list [catch {testfile mv tf1 tf2} msg] $msg
 } {1 ENOENT} 
-test winFCmd-1.19 {TclpRenameFile: errno == EACCES} {win2000} {
+test winFCmd-1.19 {TclpRenameFile: errno == EACCES} {win2000orXP} {
     cleanup
     list [catch {testfile mv nul tf1} msg] $msg
 } {1 EINVAL}
-test winFCmd-1.19.1 {TclpRenameFile: errno == EACCES} {notWin2000} {
+test winFCmd-1.19.1 {TclpRenameFile: errno == EACCES} {winOlderThan2000} {
     cleanup
     list [catch {testfile mv nul tf1} msg] $msg
 } {1 EACCES}
@@ -383,11 +383,11 @@ test winFCmd-2.7 {TclpCopyFile: errno: EACCES} {95} {
     close $fd
     set msg
 } {1 EACCES}
-test winFCmd-2.8 {TclpCopyFile: errno: EACCES} {win2000} {
+test winFCmd-2.8 {TclpCopyFile: errno: EACCES} {win2000orXP} {
     cleanup
     list [catch {testfile cp nul tf1} msg] $msg
 } {1 EINVAL}
-test winFCmd-2.8.1 {TclpCopyFile: errno: EACCES} {nt notWin2000} {
+test winFCmd-2.8.1 {TclpCopyFile: errno: EACCES} {nt winOlderThan2000} {
     cleanup
     list [catch {testfile cp nul tf1} msg] $msg
 } {1 EACCES}
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 8457ac2..be89053 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinFile.c,v 1.35 2002/07/12 16:26:05 vincentdarley Exp $
+ * RCS: @(#) $Id: tclWinFile.c,v 1.36 2002/07/15 09:01:51 vincentdarley Exp $
  */
 
 //#define _WIN32_WINNT  0x0500
@@ -1962,11 +1962,9 @@ TclpFilesystemPathType(pathObjPtr)
  * TclpObjNormalizePath --
  *
  *	This function scans through a path specification and replaces it,
- *	in place, with a normalized version.  On Windows NT/2000/XP this
- *	means using the 'longname', and expanding any symbolic links
- *	contained within the path.  On Win95/98/ME it means using the
- *	short form of the name (because the APIs to get at the long form
- *	are much too slow).
+ *	in place, with a normalized version.  This means using the
+ *	'longname', and expanding any symbolic links contained within the
+ *	path.
  *
  * Results:
  *	The new 'nextCheckpoint' value, giving as far as we could