Apply vodz' last_patch52

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

diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index d3902ffbe43f902aa20cece633d4bfcb8744df21..3d174ddb3464db5fb4d2a69450b253efab9280c2 100644 (file)
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -2,7 +2,6 @@
 /*
  * Mini copy_file implementation for busybox
  *
- *
  * Copyright (C) 2001 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -31,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "libbb.h"
+#include "busybox.h"
 
 int copy_file(const char *source, const char *dest, int flags)
 {
@@ -56,7 +55,7 @@ int copy_file(const char *source, const char *dest, int flags)
                dest_exists = 0;
        }
 
-       if (dest_exists && source_stat.st_rdev == dest_stat.st_rdev &&
+       if (dest_exists && source_stat.st_dev == dest_stat.st_dev &&
                        source_stat.st_ino == dest_stat.st_ino) {
                error_msg("`%s' and `%s' are the same file", source, dest);
                return -1;
@@ -132,22 +131,44 @@ int copy_file(const char *source, const char *dest, int flags)
                }
        } else if (S_ISREG(source_stat.st_mode)) {
                FILE *sfp, *dfp=NULL;
+#ifdef CONFIG_FEATURE_PRESERVE_HARDLINKS
+               char *link_name;
+
+               if (!(flags & FILEUTILS_DEREFERENCE) &&
+                               is_in_ino_dev_hashtable(&source_stat, &link_name)) {
+                       if (link(link_name, dest) < 0) {
+                               perror_msg("unable to link `%s'", dest);
+                               return -1;
+                       }
+
+                       return 0;
+               }
+#endif
+
+               if ((sfp = fopen(source, "r")) == NULL) {
+                       perror_msg("unable to open `%s'", source);
+                       return -1;
+               }
 
                if (dest_exists) {
                        if (flags & FILEUTILS_INTERACTIVE) {
                                fprintf(stderr, "%s: overwrite `%s'? ", applet_name, dest);
-                               if (!ask_confirmation())
+                               if (!ask_confirmation()) {
+                                       fclose (sfp);
                                        return 0;
+                               }
                        }
 
                        if ((dfp = fopen(dest, "w")) == NULL) {
                                if (!(flags & FILEUTILS_FORCE)) {
                                        perror_msg("unable to open `%s'", dest);
+                                       fclose (sfp);
                                        return -1;
                                }
 
                                if (unlink(dest) < 0) {
                                        perror_msg("unable to remove `%s'", dest);
+                                       fclose (sfp);
                                        return -1;
                                }
 
@@ -163,17 +184,11 @@ int copy_file(const char *source, const char *dest, int flags)
                                if (fd >= 0)
                                        close(fd);
                                perror_msg("unable to open `%s'", dest);
+                               fclose (sfp);
                                return -1;
                        }
                }
 
-               if ((sfp = fopen(source, "r")) == NULL) {
-                       fclose(dfp);
-                       perror_msg("unable to open `%s'", source);
-                       status = -1;
-                       goto end;
-               }
-
                if (copy_file_chunk(sfp, dfp, -1) < 0)
                        status = -1;
 
@@ -210,12 +225,21 @@ int copy_file(const char *source, const char *dest, int flags)
                        if (lchown(dest, source_stat.st_uid, source_stat.st_gid) < 0)
                                perror_msg("unable to preserve ownership of `%s'", dest);
 #endif
+
+#ifdef CONFIG_FEATURE_PRESERVE_HARDLINKS
+               add_to_ino_dev_hashtable(&source_stat, dest);
+#endif
+
                return 0;
        } else {
                error_msg("internal error: unrecognized file type");
                return -1;
        }
 
+#ifdef CONFIG_FEATURE_PRESERVE_HARDLINKS
+       add_to_ino_dev_hashtable(&source_stat, dest);
+#endif
+
 end:
 
        if (flags & FILEUTILS_PRESERVE_STATUS) {