Adding release info for 3.0.7 to the trunk.

[rsync/rsync.git] / hlink.c

diff --git a/hlink.c b/hlink.c
index 212f515..dc969e9 100644 (file)
--- a/hlink.c
+++ b/hlink.c
@@ -4,7 +4,7 @@
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2004-2008 Wayne Davison
+ * Copyright (C) 2004-2009 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
  */
 
 #include "rsync.h"
+#include "inums.h"
 #include "ifuncs.h"
 
 extern int dry_run;
@@ -30,7 +31,7 @@ extern int inc_recurse;
 extern int do_xfers;
 extern int link_dest;
 extern int preserve_acls;
-extern int make_backups;
+extern int preserve_xattrs;
 extern int protocol_version;
 extern int remove_source_files;
 extern int stdout_format_has_i;
@@ -210,7 +211,7 @@ void match_hard_links(struct file_list *flist)
 }
 
 static int maybe_hard_link(struct file_struct *file, int ndx,
-                          const char *fname, int statret, stat_x *sxp,
+                          char *fname, int statret, stat_x *sxp,
                           const char *oldname, STRUCT_STAT *old_stp,
                           const char *realname, int itemizing, enum logcode code)
 {
@@ -227,17 +228,9 @@ static int maybe_hard_link(struct file_struct *file, int ndx,
                        file->flags |= FLAG_HLINK_DONE;
                        return 0;
                }
-               if (make_backups > 0) {
-                       if (!make_backup(fname))
-                               return -1;
-               } else if (robust_unlink(fname)) {
-                       rsyserr(FERROR_XFER, errno, "unlink %s failed",
-                               full_fname(fname));
-                       return -1;
-               }
        }
 
-       if (hard_link_one(file, fname, oldname, 0)) {
+       if (atomic_create(file, fname, oldname, MAKEDEV(0, 0), sxp, statret == 0 ? DEL_FOR_FILE : 0)) {
                if (itemizing) {
                        itemize(fname, file, ndx, statret, sxp,
                                ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
@@ -247,6 +240,7 @@ static int maybe_hard_link(struct file_struct *file, int ndx,
                        rprintf(code, "%s => %s\n", fname, realname);
                return 0;
        }
+
        return -1;
 }
 
@@ -292,7 +286,7 @@ static char *check_prior(struct file_struct *file, int gnum,
 
 /* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not.  Returns:
  * 0 = process the file, 1 = skip the file, -1 = error occurred. */
-int hard_link_check(struct file_struct *file, int ndx, const char *fname,
+int hard_link_check(struct file_struct *file, int ndx, char *fname,
                    int statret, stat_x *sxp, int itemizing,
                    enum logcode code)
 {
@@ -382,9 +376,13 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname,
        }
 
        if (link_stat(prev_name, &prev_st, 0) < 0) {
-               rsyserr(FERROR_XFER, errno, "stat %s failed",
-                       full_fname(prev_name));
-               return -1;
+               if (!dry_run || errno != ENOENT) {
+                       rsyserr(FERROR_XFER, errno, "stat %s failed", full_fname(prev_name));
+                       return -1;
+               }
+               /* A new hard-link will get a new dev & inode, so approximate
+                * those values in dry-run mode by zeroing them. */
+               memset(&prev_st, 0, sizeof prev_st);
        }
 
        if (statret < 0 && basis_dir[0] != NULL) {
@@ -392,9 +390,7 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname,
                char cmpbuf[MAXPATHLEN];
                stat_x alt_sx;
                int j = 0;
-#ifdef SUPPORT_ACLS
-               alt_sx.acc_acl = alt_sx.def_acl = NULL;
-#endif
+               init_stat_x(&alt_sx);
                do {
                        pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
                        if (link_stat(cmpbuf, &alt_sx.st, 0) < 0)
@@ -423,19 +419,37 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname,
                        sxp->st = alt_sx.st;
 #ifdef SUPPORT_ACLS
                        if (preserve_acls && !S_ISLNK(file->mode)) {
-                               if (!ACL_READY(*sxp))
+                               free_acl(sxp);
+                               if (!ACL_READY(alt_sx))
                                        get_acl(cmpbuf, sxp);
                                else {
                                        sxp->acc_acl = alt_sx.acc_acl;
                                        sxp->def_acl = alt_sx.def_acl;
+                                       alt_sx.acc_acl = alt_sx.def_acl = NULL;
                                }
                        }
 #endif
-               }
+#ifdef SUPPORT_XATTRS
+                       if (preserve_xattrs) {
+                               free_xattr(sxp);
+                               if (!XATTR_READY(alt_sx))
+                                       get_xattr(cmpbuf, sxp);
+                               else {
+                                       sxp->xattr = alt_sx.xattr;
+                                       alt_sx.xattr = NULL;
+                               }
+                       }
+#endif
+               } else {
 #ifdef SUPPORT_ACLS
-               else if (preserve_acls)
-                       free_acl(&alt_sx);
+                       if (preserve_acls)
+                               free_acl(&alt_sx);
 #endif
+#ifdef SUPPORT_XATTRS
+                       if (preserve_xattrs)
+                               free_xattr(&alt_sx);
+#endif
+               }
        }
 
        if (maybe_hard_link(file, ndx, fname, statret, sxp, prev_name, &prev_st,
@@ -499,9 +513,7 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
        } else
                our_name = fname;
 
-#ifdef SUPPORT_ACLS
-       prev_sx.acc_acl = prev_sx.def_acl = NULL;
-#endif
+       init_stat_x(&prev_sx);
 
        while ((ndx = prev_ndx) >= 0) {
                int val;
@@ -517,6 +529,10 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
 #ifdef SUPPORT_ACLS
                if (preserve_acls)
                        free_acl(&prev_sx);
+#endif
+#ifdef SUPPORT_XATTRS
+               if (preserve_xattrs)
+                       free_xattr(&prev_sx);
 #endif
                if (val < 0)
                        continue;