{
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;
if (sys_lsetxattr(dest, name, ptr, datum_len) < 0) {
int save_errno = errno ? errno : EINVAL;
rsyserr(FERROR_XFER, errno,
- "rsync_xal_set: lsetxattr(\"%s\",\"%s\") failed",
+ "copy_xattrs: lsetxattr(\"%s\",\"%s\") failed",
dest, name);
errno = save_errno;
return -1;
}
/* 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);
if (F_XATTR(file) < 0) {
rprintf(FERROR, "recv_xattr_request: internal data error!\n");
- exit_cleanup(RERR_STREAMIO);
+ exit_cleanup(RERR_PROTOCOL);
}
lst += F_XATTR(file);
if (!cnt || rxa->num != num) {
rprintf(FERROR, "[%s] could not find xattr #%d for %s\n",
who_am_i(), num, f_name(file, NULL));
- exit_cleanup(RERR_STREAMIO);
+ exit_cleanup(RERR_PROTOCOL);
}
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);
+ exit_cleanup(RERR_PROTOCOL);
}
if (am_sender) {
/* ------------------------------------------------------------------------- */
/* 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;
F_XATTR(file) = ndx - 1;
return;
}
-
+
if ((count = read_varint(f)) != 0) {
(void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
temp_xattr.count = 0;
rsync_xal_l.count = prior_xattr_count;
while (xattr_item-- > xattr_start) {
rsync_xal_free(xattr_item);
- free(xattr_item);
+ free(xattr_item->items);
}
prior_xattr_count = (size_t)-1;
}
if (i == xalp->count) {
if (sys_lremovexattr(fname, name) < 0) {
rsyserr(FERROR_XFER, errno,
- "rsync_xal_clear: lremovexattr(\"%s\",\"%s\") failed",
+ "rsync_xal_set: lremovexattr(\"%s\",\"%s\") failed",
fname, name);
ret = -1;
} else /* make sure caller sets mtime */
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);
}