From 5784ef17a727e040f9964e60b26b181df02c47d2 Mon Sep 17 00:00:00 2001 From: patthoyts Date: Mon, 21 Jul 2008 14:56:07 +0000 Subject: Backported fix for bug #2015723 --- ChangeLog | 4 ++++ generic/tclFCmd.c | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b139af2..604c15c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-07-21 Pat Thoyts + + * generic/tclFCmd.c: Inodes on windows are unreliable [Bug 2015723] + 2008-07-20 Donal K. Fellows * generic/tclDictObj.c (SetDictFromAny): Make the list->dict diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c index 64782c8..2c99531 100644 --- a/generic/tclFCmd.c +++ b/generic/tclFCmd.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: tclFCmd.c,v 1.43 2007/12/13 15:23:17 dgp Exp $ + * RCS: @(#) $Id: tclFCmd.c,v 1.43.2.1 2008/07/21 14:56:10 patthoyts Exp $ */ #include "tclInt.h" @@ -522,12 +522,13 @@ CopyRenameOneFile( } /* - * Prevent copying or renaming a file onto itself. Under Windows, stat - * always returns 0 for st_ino. However, the Windows-specific code - * knows how to deal with copying or renaming a file on top of itself. - * It might be a good idea to write a stat that worked. + * Prevent copying or renaming a file onto itself. On Windows since + * 8.5 we do get an inode number, however the unsigned short field is + * insufficient to accept the Win32 API file id so it is truncated to + * 16 bits and we get collisions. See bug #2015723. */ +#ifndef WIN32 if ((sourceStatBuf.st_ino != 0) && (targetStatBuf.st_ino != 0)) { if ((sourceStatBuf.st_ino == targetStatBuf.st_ino) && (sourceStatBuf.st_dev == targetStatBuf.st_dev)) { @@ -535,6 +536,7 @@ CopyRenameOneFile( goto done; } } +#endif /* * Prevent copying/renaming a file onto a directory and vice-versa. -- cgit v0.12