diff options
| author | Jim Meyering <jim@meyering.net> | 2003-08-30 18:13:23 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2003-08-30 18:13:23 +0000 |
| commit | 97bf7dae4f9a41c751422b7976b8e06f0e5a9c67 (patch) | |
| tree | 7804306358b0a80e807bf148d140c5dcf1def1f4 /src | |
| parent | c612365c071510f4b2ac06fbe7c950b4874ac348 (diff) | |
| download | coreutils-97bf7dae4f9a41c751422b7976b8e06f0e5a9c67.tar.xz | |
When source and destination arguments refer to the same file, reside
on a partition (e.g. VFAT) on which distinct names may refer to the
same directory entry (often due to variations in case), and when the
link count for the file is 1, mv no longer unlinks the file.
FIXME: this is a band-aid fix. If the file happens to have a link
count of 2 or greater, mv will still unlink it.
(same_file_ok): Invoke same_name (which might still
return false for names that refer to the same directory entry)
only if the link count is 2 or more.
Diffstat (limited to 'src')
| -rw-r--r-- | src/copy.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/copy.c b/src/copy.c index 607e69840..d5e84f36c 100644 --- a/src/copy.c +++ b/src/copy.c @@ -426,8 +426,8 @@ close_src_desc: work to do and should return successfully, right away. Set *UNLINK_SRC if we've determined that the caller wants to do - `rename (a, b)' where `a' and `b' are hard links to the same file. - In that case, the caller should try to unlink `a' and then return + `rename (a, b)' where `a' and `b' are distinct hard links to the same + file. In that case, the caller should try to unlink `a' and then return successfully. Ideally, we wouldn't have to do that, and we'd be able to rely on rename to remove the source file. However, POSIX mistakenly requires that such a rename call do *nothing* and return @@ -561,7 +561,9 @@ same_file_ok (const char *src_path, const struct stat *src_sb, if (S_ISLNK (dst_sb_link->st_mode)) return 1; - if (same_link && !same_name (src_path, dst_path)) + if (same_link + && 1 < dst_sb_link->st_nlink + && ! same_name (src_path, dst_path)) { if (x->move_mode) { |