- add a few basic tests for pidof(8)

[oweals/busybox.git] / libbb / copy_file.c

diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 7a13e996822604a9acc6101f01b54dcd4f1207d3..cd6d3802294baafa11ad37dd4d3072265fd889c6 100644 (file)
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -54,10 +54,11 @@ int copy_file(const char *source, const char *dest, int flags)
                }
        } else {
                if (source_stat.st_dev == dest_stat.st_dev &&
-                       source_stat.st_ino == dest_stat.st_ino) {
-               bb_error_msg("`%s' and `%s' are the same file", source, dest);
-               return -1;
-       }
+                       source_stat.st_ino == dest_stat.st_ino)
+               {
+                       bb_error_msg("`%s' and `%s' are the same file", source, dest);
+                       return -1;
+               }
                dest_exists = 1;
        }
 
@@ -95,8 +96,6 @@ int copy_file(const char *source, const char *dest, int flags)
                        umask(saved_umask);
                }
 
-               add_to_ino_dev_hashtable(&dest_stat, source);
-
                /* Recursively copy files in SOURCE.  */
                if ((dp = opendir(source)) == NULL) {
                        bb_perror_msg("unable to open directory `%s'", source);
@@ -110,10 +109,6 @@ int copy_file(const char *source, const char *dest, int flags)
                        new_source = concat_subpath_file(source, d->d_name);
                        if(new_source == NULL)
                                continue;
-                       if (is_in_ino_dev_hashtable(&dest_stat, &new_source)) {
-                               bb_error_msg("cannot copy a directory, `%s', into itself, `%s'", new_source, dest);
-                               continue;
-                       }
                        new_dest = concat_path_file(dest, d->d_name);
                        if (copy_file(new_source, new_dest, flags) < 0)
                                status = -1;
@@ -152,7 +147,7 @@ int copy_file(const char *source, const char *dest, int flags)
 
                if (dest_exists) {
                        if (flags & FILEUTILS_INTERACTIVE) {
-                               bb_error_msg("overwrite `%s'? ", dest);
+                               fprintf(stderr, "%s: overwrite `%s'? ", bb_applet_name, dest);
                                if (!bb_ask_confirmation()) {
                                        close (src_fd);
                                        return 0;
@@ -203,12 +198,16 @@ int copy_file(const char *source, const char *dest, int flags)
            S_ISSOCK(source_stat.st_mode) || S_ISFIFO(source_stat.st_mode) ||
            S_ISLNK(source_stat.st_mode)) {
 
-               if (dest_exists &&
-                      ((flags & FILEUTILS_FORCE) == 0 || unlink(dest) < 0)) {
+               if (dest_exists) {
+                       if((flags & FILEUTILS_FORCE) == 0) {
+                               fprintf(stderr, "`%s' exists\n", dest);
+                               return -1;
+                       }
+                       if(unlink(dest) < 0) {
                                bb_perror_msg("unable to remove `%s'", dest);
                                return -1;
-
                        }
+               }
        } else {
                bb_error_msg("internal error: unrecognized file type");
                return -1;
@@ -248,7 +247,9 @@ int copy_file(const char *source, const char *dest, int flags)
        }
 
 #ifdef CONFIG_FEATURE_PRESERVE_HARDLINKS
-       add_to_ino_dev_hashtable(&source_stat, dest);
+       if (! S_ISDIR(source_stat.st_mode)) {
+               add_to_ino_dev_hashtable(&source_stat, dest);
+       }
 #endif
 
 end: