My version of Matt's improvements related to missing source args:

[rsync/rsync.git] / hlink.c

diff --git a/hlink.c b/hlink.c
index 536b571..6d03733 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
@@ -30,6 +30,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;
@@ -119,14 +120,15 @@ static void match_gnums(int32 *ndx_list, int ndx_count)
                if (inc_recurse) {
                        node = hashtable_find(prior_hlinks, gnum, 1);
                        if (!node->data) {
-                               node->data = new_array0(char, 5);
+                               if (!(node->data = new_array0(char, 5)))
+                                       out_of_memory("match_gnums");
                                assert(gnum >= hlink_flist->ndx_start);
                                file->flags |= FLAG_HLINK_FIRST;
                                prev = -1;
                        } else if (CVAL(node->data, 0) == 0) {
                                struct file_list *flist;
                                prev = IVAL(node->data, 1);
-                               flist = flist_for_ndx(prev);
+                               flist = flist_for_ndx(prev, NULL);
                                if (flist)
                                        flist->files[prev - flist->ndx_start]->flags &= ~FLAG_HLINK_LAST;
                                else {
@@ -179,7 +181,7 @@ static void match_gnums(int32 *ndx_list, int ndx_count)
  * to first when we're done. */
 void match_hard_links(struct file_list *flist)
 {
-       if (!list_only) {
+       if (!list_only && flist->used) {
                int i, ndx_count = 0;
                int32 *ndx_list;
 
@@ -249,17 +251,13 @@ static char *check_prior(struct file_struct *file, int gnum,
                         int *prev_ndx_p, struct file_list **flist_p)
 {
        struct file_struct *fp;
-       struct file_list *flist;
        struct ht_int32_node *node;
        int prev_ndx = F_HL_PREV(file);
 
        while (1) {
-               if (prev_ndx < 0) {
-                       *prev_ndx_p = prev_ndx;
-                       *flist_p = NULL;
-                       return NULL;
-               }
-               if ((flist = flist_for_ndx(prev_ndx)) == NULL)
+               struct file_list *flist;
+               if (prev_ndx < 0
+                || (flist = flist_for_ndx(prev_ndx, NULL)) == NULL)
                        break;
                fp = flist->files[prev_ndx - flist->ndx_start];
                if (!(fp->flags & FLAG_SKIP_HLINK)) {
@@ -270,20 +268,21 @@ static char *check_prior(struct file_struct *file, int gnum,
                F_HL_PREV(file) = prev_ndx = F_HL_PREV(fp);
        }
 
-       node = hashtable_find(prior_hlinks, gnum, 0);
-       assert(node != NULL && node->data);
-
-       if (CVAL(node->data, 0) == 0) {
+       if (inc_recurse
+        && (node = hashtable_find(prior_hlinks, gnum, 0)) != NULL) {
+               assert(node->data != NULL);
+               if (CVAL(node->data, 0) != 0) {
+                       *prev_ndx_p = -1;
+                       *flist_p = NULL;
+                       return node->data;
+               }
                /* The prior file must have been skipped. */
-               F_HL_PREV(file) = prev_ndx = -1;
-               *prev_ndx_p = prev_ndx;
-               *flist_p = NULL;
-               return NULL;
+               F_HL_PREV(file) = -1;
        }
 
-       *prev_ndx_p = prev_ndx;
-       *flist_p = flist;
-       return node->data;
+       *prev_ndx_p = -1;
+       *flist_p = NULL;
+       return NULL;
 }
 
 /* Only called if FLAG_HLINKED is set and FLAG_HLINK_FIRST is not.  Returns:
@@ -369,6 +368,9 @@ int hard_link_check(struct file_struct *file, int ndx, const char *fname,
                int j = 0;
 #ifdef SUPPORT_ACLS
                alt_sx.acc_acl = alt_sx.def_acl = NULL;
+#endif
+#ifdef SUPPORT_XATTRS
+               alt_sx.xattr = NULL;
 #endif
                do {
                        pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
@@ -398,19 +400,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,
@@ -450,7 +470,7 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
 {
        stat_x prev_sx;
        STRUCT_STAT st;
-       char alt_name[MAXPATHLEN], *prev_name;
+       char prev_name[MAXPATHLEN], alt_name[MAXPATHLEN];
        const char *our_name;
        struct file_list *flist;
        int prev_statret, ndx, prev_ndx = F_HL_PREV(file);
@@ -477,23 +497,28 @@ void finish_hard_link(struct file_struct *file, const char *fname, int fin_ndx,
 #ifdef SUPPORT_ACLS
        prev_sx.acc_acl = prev_sx.def_acl = NULL;
 #endif
+#ifdef SUPPORT_XATTRS
+       prev_sx.xattr = NULL;
+#endif
 
        while ((ndx = prev_ndx) >= 0) {
                int val;
-               flist = flist_for_ndx(ndx);
-               assert(flist != NULL);
+               flist = flist_for_ndx(ndx, "finish_hard_link");
                file = flist->files[ndx - flist->ndx_start];
                file->flags = (file->flags & ~FLAG_HLINK_FIRST) | FLAG_HLINK_DONE;
                prev_ndx = F_HL_PREV(file);
                F_HL_PREV(file) = fin_ndx;
-               prev_name = f_name(file, NULL);
-               prev_statret = link_stat(prev_name, &prev_sx.st, 0);
+               prev_statret = link_stat(f_name(file, prev_name), &prev_sx.st, 0);
                val = maybe_hard_link(file, ndx, prev_name, prev_statret, &prev_sx,
                                      our_name, stp, fname, itemizing, code);
                flist->in_progress--;
 #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;