* 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
#include "rsync.h"
#include "ifuncs.h"
+#include "inums.h"
#include "lib/sysxattrs.h"
#ifdef SUPPORT_XATTRS
#define XATTR_ABBREV(x) ((size_t)((x).name - (x).datum) < (x).datum_len)
-#define XSTATE_ABBREV 0
-#define XSTATE_DONE 1
-#define XSTATE_TODO 2
+#define XSTATE_ABBREV 1
+#define XSTATE_DONE 2
+#define XSTATE_TODO 3
#define USER_PREFIX "user."
#define UPRE_LEN ((int)sizeof USER_PREFIX - 1)
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)
static ssize_t get_xattr_names(const char *fname)
{
ssize_t list_len;
- double arg;
+ int64 arg;
if (!namebuf) {
namebuf_len = 1024;
} else if (errno == ENOTSUP)
return 0;
else if (errno != ERANGE) {
- arg = (double)namebuf_len;
+ arg = namebuf_len;
got_error:
rsyserr(FERROR_XFER, errno,
- "get_xattr_names: llistxattr(\"%s\",%.0f) failed",
- fname, arg);
+ "get_xattr_names: llistxattr(\"%s\",%s) failed",
+ fname, big_num(arg));
return -1;
}
list_len = sys_llistxattr(fname, NULL, 0);
{
sxp->xattr = new(item_list);
*sxp->xattr = empty_xattr;
+
+#ifdef NO_SPECIAL_XATTRS
+ if (IS_SPECIAL(sxp->st.st_mode))
+ return 0;
+#endif
+#ifdef NO_DEVICE_XATTRS
+ if (IS_DEVICE(sxp->st.st_mode))
+ return 0;
+#endif
+#ifdef NO_SYMLINK_XATTRS
+ if (S_ISLNK(sxp->st.st_mode))
+ return 0;
+#endif
+
if (rsync_xal_get(fname, sxp->xattr) < 0) {
free_xattr(sxp);
return -1;
size_t datum_len;
char *name, *ptr;
#ifdef HAVE_LINUX_XATTRS
- int user_only = am_sender ? 0 : !am_root;
+ int user_only = am_sender ? 0 : am_root <= 0;
#endif
/* This puts the name list into the "namebuf" buffer. */
}
/* Send the make_xattr()-generated xattr list for this flist entry. */
-int send_xattr(stat_x *sxp, int f)
+int send_xattr(int f, stat_x *sxp)
{
int ndx = find_matching_xattr(sxp->xattr);
who_am_i(), num, f_name(file, NULL));
exit_cleanup(RERR_STREAMIO);
}
- if (rxa->datum_len <= MAX_FULL_DATUM || rxa->datum[0] != XSTATE_ABBREV) {
- rprintf(FERROR, "[%s] internal abbrev error!\n", who_am_i());
+ if (!XATTR_ABBREV(*rxa) || rxa->datum[0] != XSTATE_ABBREV) {
+ rprintf(FERROR, "[%s] internal abbrev error on %s (%s, len=%ld)!\n",
+ who_am_i(), f_name(file, NULL), rxa->name, (long)rxa->datum_len);
exit_cleanup(RERR_STREAMIO);
}
/* ------------------------------------------------------------------------- */
/* receive and build the rsync_xattr_lists */
-void receive_xattr(struct file_struct *file, int f)
+void receive_xattr(int f, struct file_struct *file)
{
static item_list temp_xattr = EMPTY_ITEM_LIST;
int count, num;
/* 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 */
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->items);
+ }
+ prior_xattr_count = (size_t)-1;
+ }
+}
+
static int rsync_xal_set(const char *fname, item_list *xalp,
const char *fnamecmp, stat_x *sxp)
{
ssize_t list_len;
size_t i, len;
char *name, *ptr, sum[MAX_DIGEST_LEN];
+#ifdef HAVE_LINUX_XATTRS
+ int user_only = am_root <= 0;
+#endif
size_t name_len;
int ret = 0;
#ifdef HAVE_LINUX_XATTRS
/* We always ignore the system namespace, and non-root
* ignores everything but the user namespace. */
- if (am_root ? HAS_PREFIX(name, SYSTEM_PREFIX)
- : !HAS_PREFIX(name, USER_PREFIX))
+ if (user_only ? !HAS_PREFIX(name, USER_PREFIX)
+ : HAS_PREFIX(name, SYSTEM_PREFIX))
continue;
#endif
if (am_root < 0 && name_len > RPRE_LEN
return -1;
}
+#ifdef NO_SPECIAL_XATTRS
+ if (IS_SPECIAL(sxp->st.st_mode)) {
+ errno = ENOTSUP;
+ return -1;
+ }
+#endif
+#ifdef NO_DEVICE_XATTRS
+ if (IS_DEVICE(sxp->st.st_mode)) {
+ errno = ENOTSUP;
+ return -1;
+ }
+#endif
+#ifdef NO_SYMLINK_XATTRS
+ if (S_ISLNK(sxp->st.st_mode)) {
+ errno = ENOTSUP;
+ return -1;
+ }
+#endif
+
ndx = F_XATTR(file);
return rsync_xal_set(fname, lst + ndx, fnamecmp, sxp);
}
fst.st_mode &= (_S_IFMT | CHMOD_BITS);
fmode = new_mode & (_S_IFMT | CHMOD_BITS);
- if (IS_DEVICE(fmode) || IS_SPECIAL(fmode)) {
+ if (IS_DEVICE(fmode)) {
uint32 *devp = F_RDEV_P(file);
rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
| (S_ISDIR(fst.st_mode) ? 0700 : 0600);
if (fst.st_mode != mode)
do_chmod(fname, mode);
- if (!IS_DEVICE(fst.st_mode) && !IS_SPECIAL(fst.st_mode))
+ if (!IS_DEVICE(fst.st_mode))
fst.st_rdev = 0; /* just in case */
if (mode == fmode && fst.st_rdev == rdev
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff