From 8b5013b1b9899efdf0690cd7aa23b480e50775d6 Mon Sep 17 00:00:00 2001 From: dkf Date: Fri, 4 Oct 2002 08:25:13 +0000 Subject: [file exist] -> [file exists]... --- ChangeLog | 6 ++++++ tests/fCmd.test | 26 +++++++++++++------------- tests/winFCmd.test | 10 +++++----- tools/eolFix.tcl | 2 +- tools/genStubs.tcl | 4 ++-- 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 062f6ac..23533a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-10-04 Donal K. Fellows + + * tests/fCmd.test, tests/winFCmd.test: + * tools/eolFix.tcl, tools/genStubs.tcl: [file exist] -> [file exists] + Thanks to David Welton. + 2002-10-03 Don Porter * doc/tcltest.n: fixed typo [Bug 618018]. Thanks to "JJM". diff --git a/tests/fCmd.test b/tests/fCmd.test index 678428d..08ff618 100644 --- a/tests/fCmd.test +++ b/tests/fCmd.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: fCmd.test,v 1.24 2002/08/16 13:58:39 dkf Exp $ +# RCS: @(#) $Id: fCmd.test,v 1.25 2002/10/04 08:25:14 dkf Exp $ # if {[lsearch [namespace children] ::tcltest] == -1} { @@ -274,9 +274,9 @@ test fCmd-4.7 {TclFileMakeDirsCmd: multi levels deep} {notRoot} { test fCmd-4.8 {TclFileMakeDirsCmd: already exist: lstat(target) == 0} {notRoot} { cleanup file mkdir td1 - set x [file exist td1] + set x [file exists td1] file mkdir td1 - list $x [file exist td1] + list $x [file exists td1] } {1 1} test fCmd-4.9 {TclFileMakeDirsCmd: exists, not dir} {notRoot} { cleanup @@ -286,9 +286,9 @@ test fCmd-4.9 {TclFileMakeDirsCmd: exists, not dir} {notRoot} { test fCmd-4.10 {TclFileMakeDirsCmd: exists, is dir} {notRoot} { cleanup file mkdir td1 - set x [file exist td1] + set x [file exists td1] file mkdir td1 - list $x [file exist td1] + list $x [file exists td1] } {1 1} test fCmd-4.11 {TclFileMakeDirsCmd: doesn't exist: errno != ENOENT} \ {unixOnly notRoot testchmod} { @@ -305,9 +305,9 @@ test fCmd-4.12 {TclFileMakeDirsCmd: doesn't exist: errno != ENOENT} {macOnly} { } {1 {can't create directory "nonexistentvolume:": invalid argument}} test fCmd-4.13 {TclFileMakeDirsCmd: doesn't exist: errno == ENOENT} {notRoot} { cleanup - set x [file exist td1] + set x [file exists td1] file mkdir td1 - list $x [file exist td1] + list $x [file exists td1] } {0 1} test fCmd-4.14 {TclFileMakeDirsCmd: TclpCreateDirectory fails} \ {unixOnly notRoot} { @@ -347,9 +347,9 @@ test fCmd-5.4 {TclFileDeleteCmd: multiple files} {notRoot} { createfile tf1 createfile tf2 file mkdir td1 - set x [list [file exist tf1] [file exist tf2] [file exist td1]] + set x [list [file exists tf1] [file exists tf2] [file exists td1]] file delete tf1 td1 tf2 - lappend x [file exist tf1] [file exist tf2] [file exist tf3] + lappend x [file exists tf1] [file exists tf2] [file exists tf3] } {1 1 1 0 0 0} test fCmd-5.5 {TclFileDeleteCmd: stop at first error} {notRoot unixOrPc} { cleanup @@ -357,7 +357,7 @@ test fCmd-5.5 {TclFileDeleteCmd: stop at first error} {notRoot unixOrPc} { createfile tf2 file mkdir td1 catch {file delete tf1 td1 $root tf2} - list [file exist tf1] [file exist tf2] [file exist td1] + list [file exists tf1] [file exists tf2] [file exists td1] } {0 1 0} test fCmd-5.6 {TclFileDeleteCmd: Tcl_TranslateFileName fails} {notRoot} { list [catch {file delete ~_totally_bogus_user} msg] $msg @@ -369,15 +369,15 @@ test fCmd-5.7 {TclFileDeleteCmd: Tcl_TranslateFileName succeeds} {notRoot} { } {} test fCmd-5.8 {TclFileDeleteCmd: file doesn't exist: lstat(name) != 0} {notRoot} { cleanup - set x [file exist tf1] + set x [file exists tf1] file delete tf1 - list $x [file exist tf1] + list $x [file exists tf1] } {0 0} test fCmd-5.9 {TclFileDeleteCmd: is directory} {notRoot} { cleanup file mkdir td1 file delete td1 - file exist td1 + file exists td1 } {0} test fCmd-5.10 {TclFileDeleteCmd: TclpRemoveDirectory fails} {notRoot} { cleanup diff --git a/tests/winFCmd.test b/tests/winFCmd.test index 0a2d44f..0dcb46a 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.19 2002/07/18 16:35:12 vincentdarley Exp $ +# RCS: @(#) $Id: winFCmd.test,v 1.20 2002/10/04 08:25:14 dkf Exp $ # if {[lsearch [namespace children] ::tcltest] == -1} { @@ -288,7 +288,7 @@ test winFCmd-1.28 {TclpRenameFile: errno == EEXIST} {pcOnly} { createfile tf1 createfile tf2 testfile mv tf1 tf2 - list [file exist tf1] [file exist tf2] + list [file exists tf1] [file exists tf2] } {0 1} test winFCmd-1.29 {TclpRenameFile: src is dir} {pcOnly} { cleanup @@ -313,7 +313,7 @@ test winFCmd-1.32 {TclpRenameFile: TclpRemoveDirectory succeeds} {pcOnly} { file mkdir td1/td2 file mkdir td2 testfile mv td1 td2 - list [file exist td1] [file exist td2] [file exist td2/td2] + list [file exists td1] [file exists td2] [file exists td2/td2] } {0 1 1} test winFCmd-1.33 {TclpRenameFile: After removing dst dir, MoveFile fails} \ {pcOnly exdev} { @@ -487,7 +487,7 @@ test winFCmd-3.7 {TclpDeleteFile: DeleteFile succeeds} {pcOnly} { cleanup createfile tf1 testfile rm tf1 - file exist tf1 + file exists tf1 } {0} test winFCmd-3.8 {TclpDeleteFile: DeleteFile fails} {pcOnly} { cleanup @@ -550,7 +550,7 @@ test winFCmd-6.1 {TclpRemoveDirectory: errno: EACCES} {pcOnly} { file mkdir td1 testchmod 000 td1 testfile rmdir td1 - file exist td1 + file exists td1 } {0} test winFCmd-6.2 {TclpRemoveDirectory: errno: EEXIST} {pcOnly} { cleanup diff --git a/tools/eolFix.tcl b/tools/eolFix.tcl index 11c410d..ed3ec7c 100644 --- a/tools/eolFix.tcl +++ b/tools/eolFix.tcl @@ -16,7 +16,7 @@ namespace eval ::EOL { proc EOL::fix {filename {newfilename ""}} { variable outMode - if {![file exist $filename]} { return } + if {![file exists $filename]} { return } puts "EOL Fixing: $filename" file rename ${filename} ${filename}.o diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl index 73770ae..8a10cba 100644 --- a/tools/genStubs.tcl +++ b/tools/genStubs.tcl @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: genStubs.tcl,v 1.12 2002/08/31 06:09:46 das Exp $ +# RCS: @(#) $Id: genStubs.tcl,v 1.13 2002/10/04 08:25:14 dkf Exp $ package require Tcl 8 @@ -175,7 +175,7 @@ proc genStubs::declare {args} { # None. proc genStubs::rewriteFile {file text} { - if {![file exist $file]} { + if {![file exists $file]} { puts stderr "Cannot find file: $file" return } -- cgit v0.12