diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | tests/fCmd.test | 27 | ||||
| -rw-r--r-- | win/tclWinFCmd.c | 12 |
3 files changed, 44 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2003-06-02 Vince Darley <vincentdarley@users.sourceforge.net> + + * win/tclWinFCmd.c: + * tests/fCmd.test: fix to [Bug #747575] in which a bad error + message is given when trying to rename a busy directory to + one with the same prefix, but not the same name. Added three + new tests. + 2003-05-23 D. Richard Hipp <drh@hwaci.com> * win/tclWinTime.c: Add tests to detect and avoid a division by zero diff --git a/tests/fCmd.test b/tests/fCmd.test index 8c5d944..5b2a89f 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.27 2003/04/11 15:59:59 vincentdarley Exp $ +# RCS: @(#) $Id: fCmd.test,v 1.28 2003/06/02 15:58:46 vincentdarley Exp $ # if {[lsearch [namespace children] ::tcltest] == -1} { @@ -861,6 +861,31 @@ test fCmd-9.14 {file rename: comprehensive: dir into self} {notRoot} { file mkdir td1 list [glob td*] [list [catch {file rename td1 td1} msg] $msg] } [subst {td1 {1 {error renaming "td1" to "[file join td1 td1]": trying to rename a volume or move a directory into itself}}}] +test fCmd-9.14.1 {file rename: comprehensive: dir into self} {notRoot} { + cleanup + file mkdir td1 + file rename td1 td1x + file rename td1x td1 + set msg "ok" +} {ok} +test fCmd-9.14.2 {file rename: comprehensive: dir into self} {notRoot} { + cleanup + file mkdir td1 + set dir [pwd] + cd td1 + set res [list [catch {file rename [file join .. td1] [file join .. td1x]} msg] $msg] + cd $dir + set res +} [subst {1 {error renaming "[file join .. td1]" to "[file join .. td1x]": permission denied}}] +test fCmd-9.14.3 {file rename: comprehensive: dir into self} {notRoot} { + cleanup + file mkdir td1 + set dir [pwd] + cd td1 + set res [list [catch {file rename [file join .. td1] [file join .. td1 foo]} msg] $msg] + cd $dir + set res +} [subst {1 {error renaming "[file join .. td1]" to "[file join .. td1 foo]": trying to rename a volume or move a directory into itself}}] test fCmd-9.15 {file rename: comprehensive: source and target incompatible} \ {notRoot} { cleanup diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c index 621d352..3f2addb 100644 --- a/win/tclWinFCmd.c +++ b/win/tclWinFCmd.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinFCmd.c,v 1.35 2003/02/07 15:29:33 vincentdarley Exp $ + * RCS: @(#) $Id: tclWinFCmd.c,v 1.36 2003/06/02 15:58:47 vincentdarley Exp $ */ #include "tclWinInt.h" @@ -302,7 +302,15 @@ DoRenameFile( src = Tcl_WinTCharToUtf((TCHAR *) nativeSrcPath, -1, &srcString); dst = Tcl_WinTCharToUtf((TCHAR *) nativeDstPath, -1, &dstString); - if (strncmp(src, dst, (size_t) Tcl_DStringLength(&srcString)) == 0) { + /* + * Check whether the destination path is actually inside the + * source path. This is true if the prefix matches, and the next + * character is either end-of-string or a directory separator + */ + if ((strncmp(src, dst, (size_t) Tcl_DStringLength(&srcString)) == 0) + && (dst[Tcl_DStringLength(&srcString)] == '\\' + || dst[Tcl_DStringLength(&srcString)] == '/' + || dst[Tcl_DStringLength(&srcString)] == '\0')) { /* * Trying to move a directory into itself. */ |