- 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 0120d0b16b988068c40c1abccc7c1909a5369a4d..cd6d3802294baafa11ad37dd4d3072265fd889c6 100644 (file)
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -147,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;
@@ -198,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;