Got rid of patch fuzz.

[rsync/rsync-patches.git] / xattrs.diff

diff --git a/xattrs.diff b/xattrs.diff
index ad4591f..0b12de6 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -43,7 +43,7 @@ TODO:
  extern unsigned int file_struct_len;
  
  /* === ACL structures === */
-@@ -749,6 +750,10 @@ void receive_acl(struct file_struct *fil
+@@ -743,6 +744,10 @@ void receive_acl(struct file_struct *fil
        type = SMB_ACL_TYPE_ACCESS;
        racl_list = &access_acl_list;
        ndx_ptr = (char*)file + file_struct_len;
@@ -54,7 +54,7 @@ TODO:
        do {
                char tag = read_byte(f);
                int ndx;
-@@ -807,6 +812,10 @@ void cache_acl(struct file_struct *file,
+@@ -801,6 +806,10 @@ void cache_acl(struct file_struct *file,
        racl = sxp->acc_acl;
        racl_list = &access_acl_list;
        ndx_ptr = (char*)file + file_struct_len;
@@ -65,7 +65,7 @@ TODO:
        do {
                if (!racl)
                        ndx = -1;
-@@ -922,6 +931,10 @@ int set_acl(const char *fname, const str
+@@ -916,6 +925,10 @@ int set_acl(const char *fname, const str
  
        type = SMB_ACL_TYPE_ACCESS;
        ndx_ptr = (char*)file + file_struct_len;
@@ -175,7 +175,7 @@ TODO:
  extern int preserve_links;
  extern int preserve_hard_links;
  extern int preserve_devices;
-@@ -502,7 +503,7 @@ static struct file_struct *receive_file_
+@@ -494,7 +495,7 @@ static struct file_struct *receive_file_
        char thisname[MAXPATHLEN];
        unsigned int l1 = 0, l2 = 0;
        int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
@@ -184,7 +184,7 @@ TODO:
        int xtra_len;
  #endif
        OFF_T file_length;
-@@ -614,10 +615,16 @@ static struct file_struct *receive_file_
+@@ -606,10 +607,16 @@ static struct file_struct *receive_file_
                xtra_len = (S_ISDIR(mode) ? 2 : 1) * 4;
        else
                xtra_len = 0;
@@ -202,7 +202,7 @@ TODO:
                  + xtra_len
  #endif
                  + linkname_len + sum_len;
-@@ -626,7 +633,7 @@ static struct file_struct *receive_file_
+@@ -618,7 +625,7 @@ static struct file_struct *receive_file_
        file = (struct file_struct *)bp;
        memset(bp, 0, file_struct_len);
        bp += file_struct_len;
@@ -211,7 +211,7 @@ TODO:
        bp += xtra_len;
  #endif
  
-@@ -727,6 +734,10 @@ static struct file_struct *receive_file_
+@@ -717,6 +724,10 @@ static struct file_struct *receive_file_
        if (preserve_acls)
                receive_acl(file, f);
  #endif
@@ -222,7 +222,7 @@ TODO:
  
        return file;
  }
-@@ -997,6 +1008,13 @@ static struct file_struct *send_file_nam
+@@ -987,6 +998,13 @@ static struct file_struct *send_file_nam
                        return NULL;
        }
  #endif
@@ -236,7 +236,7 @@ TODO:
  
        maybe_emit_filelist_progress(flist->count + flist_count_offset);
  
-@@ -1009,11 +1027,19 @@ static struct file_struct *send_file_nam
+@@ -999,11 +1017,19 @@ static struct file_struct *send_file_nam
                if (preserve_acls)
                        send_acl(&sx, f);
  #endif
@@ -329,7 +329,7 @@ TODO:
  int preserve_perms = 0;
  int preserve_executability = 0;
  int preserve_devices = 0;
-@@ -196,6 +197,7 @@ static void print_rsync_version(enum log
+@@ -200,6 +201,7 @@ static void print_rsync_version(enum log
        char const *have_inplace = "no ";
        char const *hardlinks = "no ";
        char const *acls = "no ";
@@ -337,7 +337,7 @@ TODO:
        char const *links = "no ";
        char const *ipv6 = "no ";
        STRUCT_STAT *dumstat;
-@@ -215,7 +217,9 @@ static void print_rsync_version(enum log
+@@ -219,7 +221,9 @@ static void print_rsync_version(enum log
  #ifdef SUPPORT_ACLS
        acls = "";
  #endif
@@ -348,7 +348,7 @@ TODO:
  #ifdef SUPPORT_LINKS
        links = "";
  #endif
-@@ -229,9 +233,9 @@ static void print_rsync_version(enum log
+@@ -233,9 +237,9 @@ static void print_rsync_version(enum log
        rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
        rprintf(f, "<http://rsync.samba.org/>\n");
        rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
@@ -360,7 +360,7 @@ TODO:
  
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature
-@@ -304,6 +308,9 @@ void usage(enum logcode F)
+@@ -308,6 +312,9 @@ void usage(enum logcode F)
  #ifdef SUPPORT_ACLS
    rprintf(F," -A, --acls                  preserve ACLs (implies --perms)\n");
  #endif
@@ -370,7 +370,7 @@ TODO:
    rprintf(F,"     --chmod=CHMOD           change destination permissions\n");
    rprintf(F," -o, --owner                 preserve owner (super-user only)\n");
    rprintf(F," -g, --group                 preserve group\n");
-@@ -422,6 +429,9 @@ static struct poptOption long_options[] 
+@@ -427,6 +434,9 @@ static struct poptOption long_options[] 
    {"acls",            'A', POPT_ARG_NONE,   0, 'A', 0, 0 },
    {"no-acls",          0,  POPT_ARG_VAL,    &preserve_acls, 0, 0, 0 },
    {"no-A",             0,  POPT_ARG_VAL,    &preserve_acls, 0, 0, 0 },
@@ -380,7 +380,7 @@ TODO:
    {"times",           't', POPT_ARG_VAL,    &preserve_times, 1, 0, 0 },
    {"no-times",         0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
    {"no-t",             0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
-@@ -1099,6 +1109,17 @@ int parse_arguments(int *argc, const cha
+@@ -1109,6 +1119,17 @@ int parse_arguments(int *argc, const cha
                        return 0;
  #endif
  
@@ -398,7 +398,7 @@ TODO:
  
                default:
                        /* A large opt value means that set_refuse_options()
-@@ -1538,6 +1559,10 @@ void server_options(char **args,int *arg
+@@ -1560,6 +1581,10 @@ void server_options(char **args,int *arg
        if (preserve_acls)
                argstr[x++] = 'A';
  #endif
@@ -413,7 +413,7 @@ TODO:
 +++ new/rsync.c
 @@ -34,6 +34,7 @@ extern int verbose;
  extern int dry_run;
- extern int daemon_log_format_has_i;
+ extern int logfile_format_has_i;
  extern int preserve_acls;
 +extern int preserve_xattrs;
  extern int preserve_perms;
@@ -432,7 +432,7 @@ TODO:
        if ((sxp->st.st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
 --- old/rsync.h
 +++ new/rsync.h
-@@ -494,6 +494,10 @@ struct idev {
+@@ -495,6 +495,10 @@ struct idev {
  #define ACLS_NEED_MASK 1
  #endif
  
@@ -443,7 +443,7 @@ TODO:
  #define GID_NONE ((gid_t)-1)
  
  #define HL_CHECK_MASTER       0
-@@ -686,6 +690,9 @@ typedef struct {
+@@ -687,6 +691,9 @@ typedef struct {
      struct rsync_acl *acc_acl; /* access ACL */
      struct rsync_acl *def_acl; /* default ACL */
  #endif
@@ -463,7 +463,7 @@ TODO:
       --chmod=CHMOD           change destination permissions
   -o, --owner                 preserve owner (super-user only)
   -g, --group                 preserve group
-@@ -807,6 +808,11 @@ version makes it incompatible with sendi
+@@ -809,6 +810,11 @@ version makes it incompatible with sendi
  rsync unless you double the bf(--acls) option (e.g. bf(-AA)).  This
  doubling is not needed when pulling files from an older rsync.