- 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 637b8179b04a18835c700395c256b2fe7b8275e0..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;
        }
 
@@ -65,28 +66,12 @@ int copy_file(const char *source, const char *dest, int flags)
                DIR *dp;
                struct dirent *d;
                mode_t saved_umask = 0;
-               char *dstparent;
-               struct stat dstparent_stat;
 
                if (!(flags & FILEUTILS_RECUR)) {
                        bb_error_msg("%s: omitting directory", source);
                        return -1;
                }
 
-               dstparent = dirname(bb_xstrdup(dest));
-               if (lstat(dstparent, &dstparent_stat) < 0) {
-                       bb_perror_msg("unable to stat `%s'", dstparent);
-                       free(dstparent);
-                       return -1;
-               }
-               free(dstparent);
-
-               if (source_stat.st_dev == dstparent_stat.st_dev &&
-                       source_stat.st_ino == dstparent_stat.st_ino) {
-                       bb_error_msg("cannot copy a directory, `%s', into itself, `%s'", source, dest);
-                       return -1;
-               }
-
                /* Create DEST.  */
                if (dest_exists) {
                        if (!S_ISDIR(dest_stat.st_mode)) {
@@ -162,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;
@@ -213,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;
@@ -258,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: