Fixed an ACL/xattr corruption issue where the --backup option could cause

[rsync/rsync.git] / xattrs.c

diff --git a/xattrs.c b/xattrs.c
index 051c08d..b903475 100644 (file)
--- a/xattrs.c
+++ b/xattrs.c
@@ -3,7 +3,7 @@
  * Written by Jay Fenlason, vaguely based on the ACLs patch.
  *
  * Copyright (C) 2004 Red Hat, Inc.
- * Copyright (C) 2006-2008 Wayne Davison
+ * Copyright (C) 2006-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 "ifuncs.h"
+#include "inums.h"
 #include "lib/sysxattrs.h"
 
 #ifdef SUPPORT_XATTRS
@@ -81,6 +82,8 @@ static char *namebuf = NULL;
 static item_list empty_xattr = EMPTY_ITEM_LIST;
 static item_list rsync_xal_l = EMPTY_ITEM_LIST;
 
+static size_t prior_xattr_count = (size_t)-1;
+
 /* ------------------------------------------------------------------------- */
 
 static void rsync_xal_free(item_list *xalp)
@@ -136,7 +139,7 @@ static ssize_t get_xattr_names(const char *fname)
                  got_error:
                        rsyserr(FERROR_XFER, errno,
                                "get_xattr_names: llistxattr(\"%s\",%s) failed",
-                               fname, big_num(arg, 0));
+                               fname, big_num(arg));
                        return -1;
                }
                list_len = sys_llistxattr(fname, NULL, 0);
@@ -724,13 +727,15 @@ void receive_xattr(struct file_struct *file, int f)
 
 /* Turn the xattr data in stat_x into cached xattr data, setting the index
  * values in the file struct. */
-void cache_xattr(struct file_struct *file, stat_x *sxp)
+void cache_tmp_xattr(struct file_struct *file, stat_x *sxp)
 {
        int ndx;
 
        if (!sxp->xattr)
                return;
 
+       if (prior_xattr_count == (size_t)-1)
+               prior_xattr_count = rsync_xal_l.count;
        ndx = find_matching_xattr(sxp->xattr);
        if (ndx < 0)
                rsync_xal_store(sxp->xattr); /* adds item to rsync_xal_l */
@@ -738,6 +743,21 @@ void cache_xattr(struct file_struct *file, stat_x *sxp)
        F_XATTR(file) = ndx;
 }
 
+void uncache_tmp_xattrs(void)
+{
+       if (prior_xattr_count != (size_t)-1) {
+               item_list *xattr_item = rsync_xal_l.items;
+               item_list *xattr_start = xattr_item + prior_xattr_count;
+               xattr_item += rsync_xal_l.count;
+               rsync_xal_l.count = prior_xattr_count;
+               while (xattr_item-- > xattr_start) {
+                       rsync_xal_free(xattr_item);
+                       free(xattr_item);
+               }
+               prior_xattr_count = (size_t)-1;
+       }
+}
+
 static int rsync_xal_set(const char *fname, item_list *xalp,
                         const char *fnamecmp, stat_x *sxp)
 {