popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
--- old/backup.c
+++ new/backup.c
-@@ -133,6 +133,7 @@ static int make_bak_dir(char *fullpath)
- do_lchown(fullpath, st.st_uid, st.st_gid);
- do_chmod(fullpath, st.st_mode);
- (void)DUP_ACL(end, fullpath, st.st_mode);
-+ (void)DUP_XATTR(end, fullpath );
+@@ -29,6 +29,7 @@ extern char *backup_dir;
+
+ extern int am_root;
+ extern int preserve_acls;
++extern int preserve_xattrs;
+ extern int preserve_devices;
+ extern int preserve_specials;
+ extern int preserve_links;
+@@ -137,6 +138,10 @@ static int make_bak_dir(char *fullpath)
+ if (preserve_acls)
+ dup_acl(end, fullpath, st.st_mode);
+ #endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs)
++ dup_xattr(end, fullpath );
++#endif
}
}
*p = '/';
-@@ -187,6 +188,7 @@ static int keep_backup(char *fname)
- return 0;
-
- PUSH_KEEP_BACKUP_ACL(file, fname, buf);
-+ PUSH_KEEP_BACKUP_XATTR(file, fname, buf);
+@@ -194,6 +199,10 @@ static int keep_backup(char *fname)
+ if (preserve_acls)
+ push_keep_backup_acl(file, fname, buf);
+ #endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs)
++ push_keep_backup_xattr(file, fname, buf);
++#endif
/* Check to see if this is a device file, or link */
if ((am_root && preserve_devices && IS_DEVICE(file->mode))
-@@ -264,6 +266,7 @@ static int keep_backup(char *fname)
- }
- set_file_attrs(buf, file, NULL, 0);
- CLEANUP_KEEP_BACKUP_ACL();
-+ CLEANUP_KEEP_BACKUP_XATTR();
+@@ -274,6 +283,10 @@ static int keep_backup(char *fname)
+ if (preserve_acls)
+ cleanup_keep_backup_acl();
+ #endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs)
++ cleanup_keep_backup_xattr();
++#endif
free(file);
if (verbose > 1) {
--- old/flist.c
+++ new/flist.c
-@@ -968,6 +968,8 @@ static struct file_struct *send_file_nam
- return NULL;
- if (MAKE_ACL(file, fname) < 0)
+@@ -45,6 +45,7 @@ extern int one_file_system;
+ extern int copy_dirlinks;
+ extern int keep_dirlinks;
+ extern int preserve_acls;
++extern int preserve_xattrs;
+ extern int preserve_links;
+ extern int preserve_hard_links;
+ extern int preserve_devices;
+@@ -975,6 +976,10 @@ static struct file_struct *send_file_nam
+ if (preserve_acls && make_acl(file, fname) < 0)
return NULL;
-+ if (MAKE_XATTR(file, fname) < 0)
+ #endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs && make_xattr(file, fname) < 0)
+ return NULL;
++#endif
+
+ maybe_emit_filelist_progress(flist->count + flist_count_offset);
- if (chmod_modes && !S_ISLNK(file->mode))
- file->mode = tweak_mode(file->mode, chmod_modes);
-@@ -980,9 +982,11 @@ static struct file_struct *send_file_nam
- flist->files[flist->count++] = file;
- send_file_entry(file, f);
- SEND_ACL(file, f);
-+ SEND_XATTR(file, f);
+@@ -987,12 +992,20 @@ static struct file_struct *send_file_nam
+ if (preserve_acls)
+ send_acl(file, f);
+ #endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs)
++ send_xattr(file, f);
++#endif
} else {
+ #ifdef SUPPORT_ACLS
/* Cleanup unsent ACL(s). */
- SEND_ACL(file, -1);
-+ SEND_XATTR(file, -1);
+ if (preserve_acls)
+ send_acl(file, -1);
+ #endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs)
++ send_xattr(file, -1);
++#endif
}
return file;
}
-@@ -1372,6 +1376,7 @@ struct file_list *recv_file_list(int f)
- file = receive_file_entry(flist, flags, f);
-
- RECEIVE_ACL(file, f);
-+ RECEIVE_XATTR(file, f );
+@@ -1385,6 +1398,10 @@ struct file_list *recv_file_list(int f)
+ if (preserve_acls)
+ receive_acl(file, f);
+ #endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs)
++ receive_xattr(file, f );
++#endif
if (S_ISREG(file->mode) || S_ISLNK(file->mode))
stats.total_size += file->length;
-@@ -1396,6 +1401,7 @@ struct file_list *recv_file_list(int f)
- clean_flist(flist, relative_paths, 1);
-
- SORT_FILE_ACL_INDEX_LISTS();
-+ SORT_FILE_XATTR_INDEX_LISTS();
-
- if (f >= 0) {
- recv_uid_list(f, flist);
---- old/generator.c
-+++ new/generator.c
-@@ -916,6 +916,10 @@ static void recv_generator(char *fname,
- if (f_out == -1)
- SET_ACL(fname, file);
+@@ -1412,6 +1429,10 @@ struct file_list *recv_file_list(int f)
+ if (preserve_acls)
+ sort_file_acl_index_lists();
#endif
+#ifdef SUPPORT_XATTRS
-+ if (f_out == -1)
-+ SET_XATTR(fname, file);
++ if (preserve_xattrs)
++ sort_file_xattr_index_lists();
+#endif
- if (delete_during && f_out != -1 && !phase && dry_run < 2
- && (file->flags & FLAG_DEL_HERE))
- delete_in_dir(the_file_list, fname, file, &st);
+
+ if (f >= 0) {
+ recv_uid_list(f, flist);
--- old/lib/sysxattr.c
+++ new/lib/sysxattr.c
@@ -0,0 +1,41 @@
+
+#include "rsync.h"
+
-+#if defined(HAVE_LINUX_XATTRS)
++#if defined HAVE_LINUX_XATTRS
+
+ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
+{
--- old/lib/sysxattr.h
+++ new/lib/sysxattr.h
@@ -0,0 +1,9 @@
-+#if defined(HAVE_LINUX_XATTRS)
++#if defined HAVE_LINUX_XATTRS
+
+ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size);
+int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags);
if (preserve_gid)
--- old/rsync.c
+++ new/rsync.c
-@@ -218,12 +218,15 @@ int set_file_attrs(char *fname, struct f
- }
+@@ -34,6 +34,7 @@ extern int verbose;
+ extern int dry_run;
+ extern int daemon_log_format_has_i;
+ extern int preserve_acls;
++extern int preserve_xattrs;
+ extern int preserve_perms;
+ extern int preserve_executability;
+ extern int preserve_times;
+@@ -215,6 +216,10 @@ int set_file_attrs(char *fname, struct f
+ if (preserve_acls && set_acl(fname, file, &st->st_mode) == 0)
+ updated = 1;
#endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs && set_xattr(fname, file) == 0)
++ updated = 1;
++#endif
-- /* If this is a directory, SET_ACL() will be called on the cleanup
-- * receive_generator() pass (if we called it here, we might clobber
-- * writability on the directory). Everything else is OK to do now. */
-+ /* If this is a directory, SET_ACL() and/or SET_XATTR() will be called
-+ * on the cleanup receive_generator() pass -- if we called it here, we
-+ * might clobber writability on the dir (SELinux security contexts are
-+ * stored in xattrs). Everything else is OK to do now. */
- if (!S_ISDIR(st->st_mode)) {
- if (SET_ACL(fname, file) == 0)
- updated = 1;
-+ if (SET_XATTR(fname, file) == 0)
-+ updated = 1;
- }
-
- if (verbose > 1 && flags & ATTRS_REPORT) {
+ #ifdef HAVE_CHMOD
+ if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
--- old/rsync.h
+++ new/rsync.h
-@@ -696,6 +696,38 @@ struct chmod_mode_struct;
- #endif /* SUPPORT_ACLS */
+@@ -672,6 +672,14 @@ struct chmod_mode_struct;
+ #endif
#include "smb_acls.h"
+#ifdef HAVE_LINUX_XATTRS
+#define SUPPORT_XATTRS 1
+#endif
+
-+#ifdef SUPPORT_XATTRS
-+#ifdef HAVE_ATTR_XATTR_H
++#if defined SUPPORT_XATTRS && defined HAVE_ATTR_XATTR_H
+#include <attr/xattr.h>
+#endif
-+#define MAKE_XATTR(file, fname) make_xattr(file, fname)
-+#define SEND_XATTR(file, f) send_xattr(file, f)
-+#define RECEIVE_XATTR(file, f) receive_xattr(file, f)
-+#define SORT_FILE_XATTR_INDEX_LISTS() sort_file_xattr_index_lists()
-+#define SET_XATTR(fname, file) set_xattr(fname, file)
-+#define NEXT_XATTR_UID() next_xattr_uid()
-+#define XATTR_UID_MAP(uid) xattr_uid_map(uid)
-+#define PUSH_KEEP_BACKUP_XATTR(file, orig, dest) \
-+ push_keep_backup_xattr(file, orig, dest)
-+#define CLEANUP_KEEP_BACKUP_XATTR() cleanup_keep_backup_xattr()
-+#define DUP_XATTR(orig, dest) dup_xattr(orig, dest)
-+#else /* SUPPORT_XATTRS */
-+#define MAKE_XATTR(file, fname) 1 /* checked return value */
-+#define SEND_XATTR(file, f)
-+#define RECEIVE_XATTR(file, f)
-+#define SORT_FILE_XATTR_INDEX_LISTS()
-+#define SET_XATTR(fname, file) 1 /* checked return value */
-+#define NEXT_XATTR_UID()
-+#define XATTR_UID_MAP(uid)
-+#define PUSH_KEEP_BACKUP_XATTR(file, orig, dest)
-+#define CLEANUP_KEEP_BACKUP_XATTR()
-+#define DUP_XATTR(src, orig) 1 /* checked return value */
-+#endif /* SUPPORT_XATTRS */
+
#include "proto.h"
transfer. The resulting value is treated as though it was the permissions
--- old/xattr.c
+++ new/xattr.c
-@@ -0,0 +1,540 @@
+@@ -0,0 +1,521 @@
+/* Extended Attribute support for rsync */
+/* Copyright (C) 2004 Red Hat, Inc */
+/* Written by Jay Fenlason, vaguely based on the ACLs patch */
+
+#ifdef SUPPORT_XATTRS
+
-+extern int preserve_xattrs;
+extern int dry_run;
+
+#define RSYNC_XAL_INITIAL 5
+/* generate the xattr(s) for this flist entry;
+ * xattr(s) are either sent or cleaned-up by send_xattr() below */
+
-+int make_xattr(const struct file_struct *file, const char *fname)
++int make_xattr(UNUSED(const struct file_struct *file), const char *fname)
+{
-+ if (!preserve_xattrs || !file)
-+ return 1;
-+
+ rsync_xal_get(fname, &curr_rsync_xal);
+ return 0; /* TODO: This needs to return 1 if no xattrs changed! */
+}
+/* send the make_xattr()-generated xattr list for this flist entry,
+ * or clean up after an flist entry that's not being sent (f == -1) */
+
-+void send_xattr(const struct file_struct *file, int f)
++void send_xattr(UNUSED(const struct file_struct *file), int f)
+{
+ ssize_t index;
+
-+ if (!preserve_xattrs || !file)
-+ return;
-+
+ if (f == -1) {
+ rsync_xal_free(&curr_rsync_xal);
+ return;
+ char *fname;
+ int tag;
+
-+ if (!preserve_xattrs)
-+ return;
+ fname = f_name(file, NULL);
+ tag = read_byte(f);
+ if (tag != 'X' && tag != 'x') {
+{
+ int ret;
+
-+ if (!preserve_xattrs)
-+ return 1;
-+
+ if (rsync_xal_get(orig, &backup_xal) < 0)
+ ret = rsync_xal_set(bak, &backup_xal);
+ else
+ ret = 0;
+ rsync_xal_free(&backup_xal);
++
+ return ret;
+}
+
+void push_keep_backup_xattr(const struct file_struct *file, const char *orig, const char *dest)
+{
-+ if (!preserve_xattrs)
-+ return;
-+
+ backup_orig_file = file;
+ backup_orig_fname = orig;
+ backup_dest_fname = dest;
+
+static int set_keep_backup_xal(void)
+{
-+ if (!preserve_xattrs)
-+ return 1;
+ return rsync_xal_set(backup_dest_fname, &backup_xal);
+}
+
+void cleanup_keep_backup_xattr(void)
+{
-+ if (!preserve_xattrs)
-+ return;
-+
+ backup_orig_file = NULL;
+ backup_orig_fname = null_string;
+ backup_dest_fname = null_string;
+
+void sort_file_xattr_index_lists(void)
+{
-+ if (!preserve_xattrs)
-+ return;
+ qsort(fxil.filexalidxs, fxil.count, sizeof (file_xal_index), file_xal_index_compare);
+}
+
+ int xalidx;
+ rsync_xal *x;
+
-+ if (dry_run || !preserve_xattrs)
-+ return 1;
++ if (dry_run)
++ return 1; /* FIXME: --dry-run needs to compute this value */
++
+ if (file == backup_orig_file) {
+ if (!strcmp(fname, backup_dest_fname))
+ return set_keep_backup_xal();
+ }
+ xalidx = find_file_xal_index(file);
+ x = &(rsync_xal_l.rxals[xalidx]);
++
+ return rsync_xal_set(fname, x);
+}
+
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff