Make sure that config.h.in is up-to-date before allowing the

[rsync/rsync.git] / hlink.c

diff --git a/hlink.c b/hlink.c
index 5f0f5a6..c9eb33a 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
@@ -22,6 +22,7 @@
 
 #include "rsync.h"
 #include "inums.h"
+#include "ifuncs.h"
 
 extern int dry_run;
 extern int list_only;
@@ -30,6 +31,7 @@ extern int inc_recurse;
 extern int do_xfers;
 extern int link_dest;
 extern int preserve_acls;
+extern int preserve_xattrs;
 extern int make_backups;
 extern int protocol_version;
 extern int remove_source_files;
@@ -215,6 +217,7 @@ static int maybe_hard_link(struct file_struct *file, int ndx,
                           const char *realname, int itemizing, enum logcode code)
 {
        if (statret == 0) {
+               int ok = 0;
                if (sxp->st.st_dev == old_stp->st_dev
                 && sxp->st.st_ino == old_stp->st_ino) {
                        if (itemizing) {
@@ -227,10 +230,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)) {
+               if (make_backups > 0 && (ok = make_backup(fname, True)) == 0)
+                       return -1;
+               if (ok != 1 && robust_unlink(fname) && errno != ENOENT) {
                        rsyserr(FERROR_XFER, errno, "unlink %s failed",
                                full_fname(fname));
                        return -1;
@@ -392,9 +394,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 +423,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 +517,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 +533,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;