diff options
| -rw-r--r-- | src/copy.c | 79 |
1 files changed, 46 insertions, 33 deletions
diff --git a/src/copy.c b/src/copy.c index f37fe62f6..0330a2bea 100644 --- a/src/copy.c +++ b/src/copy.c @@ -815,38 +815,6 @@ copy_internal (const char *src_path, const char *dst_path, src_type = src_sb.st_mode; - /* Associate the destination path with the source device and inode - so that if we encounter a matching dev/ino pair in the source tree - we can arrange to create a hard link between the corresponding names - in the destination tree. - - Sometimes, when preserving links, we have to record dev/ino even - though st_nlink == 1: - - when using -H and processing a command line argument; - that command line argument could be a symlink pointing to another - command line argument. With `cp -H --preserve=link', we hard-link - those two destination files. - - likewise for -L except that it applies to all files, not just - command line arguments. - - Also record directory dev/ino when using --recursive. We'll use that - info to detect this problem: cp -R dir dir. FIXME-maybe: ideally, - directory info would be recorded in a separate hash table, since - such entries are useful only while a single command line hierarchy - is being copied -- so that separate table could be cleared between - command line args. Using the same hash table to preserve hard - links means that it may not be cleared. */ - - if ((x->preserve_links - && (1 < src_sb.st_nlink - || (command_line_arg - && x->dereference == DEREF_COMMAND_LINE_ARGUMENTS) - || x->dereference == DEREF_ALWAYS)) - || (x->recursive && S_ISDIR (src_type))) - { - earlier_file = remember_copied (dst_path, src_sb.st_ino, src_sb.st_dev); - } - src_mode = src_sb.st_mode; if (S_ISDIR (src_type) && !x->recursive) @@ -1084,6 +1052,38 @@ copy_internal (const char *src_path, const char *dst_path, putchar ('\n'); } + /* Associate the destination path with the source device and inode + so that if we encounter a matching dev/ino pair in the source tree + we can arrange to create a hard link between the corresponding names + in the destination tree. + + Sometimes, when preserving links, we have to record dev/ino even + though st_nlink == 1: + - when using -H and processing a command line argument; + that command line argument could be a symlink pointing to another + command line argument. With `cp -H --preserve=link', we hard-link + those two destination files. + - likewise for -L except that it applies to all files, not just + command line arguments. + + Also record directory dev/ino when using --recursive. We'll use that + info to detect this problem: cp -R dir dir. FIXME-maybe: ideally, + directory info would be recorded in a separate hash table, since + such entries are useful only while a single command line hierarchy + is being copied -- so that separate table could be cleared between + command line args. Using the same hash table to preserve hard + links means that it may not be cleared. */ + + if ((x->preserve_links + && (1 < src_sb.st_nlink + || (command_line_arg + && x->dereference == DEREF_COMMAND_LINE_ARGUMENTS) + || x->dereference == DEREF_ALWAYS)) + || (x->recursive && S_ISDIR (src_type))) + { + earlier_file = remember_copied (dst_path, src_sb.st_ino, src_sb.st_dev); + } + /* Did we copy this inode somewhere else (in this command line argument) and therefore this is a second hard link to the inode? */ @@ -1172,6 +1172,11 @@ copy_internal (const char *src_path, const char *dst_path, error (0, 0, _("cannot move %s to a subdirectory of itself, %s"), quote_n (0, top_level_src_path), quote_n (1, top_level_dst_path)); + + /* Note that there is no need to call forget_created here, + (compare with the other calls in this file) since the + destination directory didn't exist before. */ + *copy_into_self = 1; /* FIXME-cleanup: Don't return zero here; adjust mv.c accordingly. The only caller that uses this code (mv.c) ends up setting its @@ -1209,6 +1214,7 @@ copy_internal (const char *src_path, const char *dst_path, error (0, errno, _("cannot move %s to %s"), quote_n (0, src_path), quote_n (1, dst_path)); + forget_created (src_sb.st_ino, src_sb.st_dev); return 1; } @@ -1217,10 +1223,10 @@ copy_internal (const char *src_path, const char *dst_path, the rename syscall. */ if (unlink (dst_path) && errno != ENOENT) { - /* Use the value of errno from the failed rename. */ error (0, errno, _("inter-device move failed: %s to %s; unable to remove target"), quote_n (0, src_path), quote_n (1, dst_path)); + forget_created (src_sb.st_ino, src_sb.st_dev); return 1; } @@ -1522,6 +1528,13 @@ copy_internal (const char *src_path, const char *dst_path, return delayed_fail; un_backup: + + /* We didn't create the destination. + Remove the entry associating the source dev/ino with the + destination file name, so we don't try to `preserve' a link + to a file we didn't create. */ + forget_created (src_sb.st_ino, src_sb.st_dev); + if (dst_backup) { if (rename (dst_backup, dst_path)) |