PublicArchive/gnu-coreutils
2
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils synced 2026-06-04 14:55:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

(copy_internal): Remove earlier (but less effective)

Browse Source 
test for move/copy-into-self.
Instead, deduce the move-into-self condition from errno==EINVAL
after a failed rename.
This commit is contained in:
Jim Meyering
1998-11-30 02:10:13 +00:00
parent 955d2c6ae5
commit 32df3704e4
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/copy.c
+23 -14
View File
@@ -387,14 +387,6 @@ copy_internal (const char *src_path, const char *dst_path,
earlier_file = remember_copied (dst_path, src_sb.st_ino, src_sb.st_dev);
/* Did we just create this file? */
if (earlier_file == &new_file)
{
*copy_into_self = 1;
return 0;
}
src_mode = src_sb.st_mode;
src_type = src_sb.st_mode;
@@ -617,13 +609,30 @@ copy_internal (const char *src_path, const char *dst_path,
return 0;
}
if (move_mode && rename (src_path, dst_path) == 0)
if (move_mode)
{
if (x->verbose && S_ISDIR (src_type))
printf ("%s -> %s\n", src_path, dst_path);
if (rename_succeeded)
*rename_succeeded = 1;
return 0;
if (rename (src_path, dst_path) == 0)
{
if (x->verbose && S_ISDIR (src_type))
printf ("%s -> %s\n", src_path, dst_path);
if (rename_succeeded)
*rename_succeeded = 1;
return 0;
}
/* FIXME: someday, consider what to do when moving a directory into
itself but when source and destination are on different devices. */
/* This happens when attempting to rename a directory to a
subdirectory of itself. */
if (errno == EINVAL)
{
/* FIXME: this is a little fragile in that it relies on rename(2)
returning a specific errno (EINVAL). Expect problems on
non-POSIX systems. */
*copy_into_self = 1;
return 0;
}
}
if (S_ISDIR (src_type))