diff options
author | patthoyts <patthoyts@noemail.net> | 2008-07-21 14:42:54 (GMT) |
---|---|---|
committer | patthoyts <patthoyts@noemail.net> | 2008-07-21 14:42:54 (GMT) |
commit | 06fb2755cdd754f74e40275217f79c0043424915 (patch) | |
tree | 58049ea0b7ce2f0fcf53bf96753b509c317ee905 /generic/tclFCmd.c | |
parent | 32be321a7a680f150f68f84934cf1390b19744c7 (diff) | |
download | tcl-06fb2755cdd754f74e40275217f79c0043424915.zip tcl-06fb2755cdd754f74e40275217f79c0043424915.tar.gz tcl-06fb2755cdd754f74e40275217f79c0043424915.tar.bz2 |
Inode numbers on Windows are not unique so avoid the inode check on this platform [Bug 2015723]
FossilOrigin-Name: afa89c186541975ee5d57f1c752717fd25d3d127
Diffstat (limited to 'generic/tclFCmd.c')
-rw-r--r-- | generic/tclFCmd.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c index 01eea62..dc13ef4 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.45 2008/07/13 23:15:23 nijtmans Exp $ + * RCS: @(#) $Id: tclFCmd.c,v 1.46 2008/07/21 14:42:57 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. |