Fixed failing hunks.

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

diff --git a/xattrs.diff b/xattrs.diff
index 4a6f998..d9e5f18 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -8,8 +8,8 @@ After applying this patch, run these commands for a successful build:
     make proto
     make
 
---- orig/Makefile.in   2005-07-07 23:11:55
-+++ Makefile.in        2005-07-07 23:15:20
+--- orig/Makefile.in   2005-11-07 04:31:05
++++ Makefile.in        2005-11-07 04:38:36
 @@ -27,13 +27,13 @@ VERSION=@VERSION@
  
  HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
@@ -21,8 +21,8 @@ After applying this patch, run these commands for a successful build:
  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
        main.o checksum.o match.o syscall.o log.o backup.o
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
--      fileio.o batch.o clientname.o acls.o
-+      fileio.o batch.o clientname.o acls.o xattr.o
+-      fileio.o batch.o clientname.o chmod.o acls.o
++      fileio.o batch.o clientname.o chmod.o acls.o xattr.o
  OBJS3=progress.o pipe.o
  DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
  popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
@@ -87,7 +87,7 @@ After applying this patch, run these commands for a successful build:
  
 --- orig/flist.c       2005-07-29 02:49:06
 +++ flist.c    2005-10-16 23:03:04
-@@ -968,6 +968,8 @@ static struct file_struct *send_file_nam
+@@ -962,6 +962,8 @@ static struct file_struct *send_file_nam
                return NULL;
        if (MAKE_ACL(file, fname) < 0)
                return NULL;
@@ -96,7 +96,7 @@ After applying this patch, run these commands for a successful build:
  
        maybe_emit_filelist_progress(flist->count + flist_count_offset);
  
-@@ -977,9 +979,11 @@ static struct file_struct *send_file_nam
+@@ -971,9 +973,11 @@ static struct file_struct *send_file_nam
                flist->files[flist->count++] = file;
                send_file_entry(file, f, base_flags);
                SEND_ACL(file, f);
@@ -108,7 +108,7 @@ After applying this patch, run these commands for a successful build:
        }
        return file;
  }
-@@ -1327,6 +1331,7 @@ struct file_list *recv_file_list(int f)
+@@ -1330,6 +1334,7 @@ struct file_list *recv_file_list(int f)
                file = receive_file_entry(flist, flags, f);
  
                RECEIVE_ACL(file, f);
@@ -116,7 +116,7 @@ After applying this patch, run these commands for a successful build:
  
                if (S_ISREG(file->mode))
                        stats.total_size += file->length;
-@@ -1351,6 +1356,7 @@ struct file_list *recv_file_list(int f)
+@@ -1354,6 +1359,7 @@ struct file_list *recv_file_list(int f)
        clean_flist(flist, relative_paths, 1);
  
        SORT_FILE_ACL_INDEX_LISTS();
@@ -195,7 +195,7 @@ After applying this patch, run these commands for a successful build:
 +#endif /* No xattrs */
 --- orig/options.c     2005-08-27 21:15:29
 +++ options.c  2005-08-27 21:29:40
-@@ -44,6 +44,7 @@ int copy_links = 0;
+@@ -45,6 +45,7 @@ int copy_links = 0;
  int preserve_links = 0;
  int preserve_hard_links = 0;
  int preserve_acls = 0;
@@ -203,7 +203,7 @@ After applying this patch, run these commands for a successful build:
  int preserve_perms = 0;
  int preserve_devices = 0;
  int preserve_uid = 0;
-@@ -184,6 +185,7 @@ static void print_rsync_version(enum log
+@@ -189,6 +190,7 @@ static void print_rsync_version(enum log
        char const *have_inplace = "no ";
        char const *hardlinks = "no ";
        char const *acls = "no ";
@@ -211,7 +211,7 @@ After applying this patch, run these commands for a successful build:
        char const *links = "no ";
        char const *ipv6 = "no ";
        STRUCT_STAT *dumstat;
-@@ -203,7 +205,9 @@ static void print_rsync_version(enum log
+@@ -208,7 +210,9 @@ static void print_rsync_version(enum log
  #ifdef SUPPORT_ACLS
        acls = "";
  #endif
@@ -222,7 +222,7 @@ After applying this patch, run these commands for a successful build:
  #ifdef SUPPORT_LINKS
        links = "";
  #endif
-@@ -218,9 +222,9 @@ static void print_rsync_version(enum log
+@@ -223,9 +227,9 @@ static void print_rsync_version(enum log
                "Copyright (C) 1996-2005 by Andrew Tridgell and others\n");
        rprintf(f, "<http://rsync.samba.org/>\n");
        rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
@@ -234,7 +234,7 @@ After applying this patch, run these commands for a successful build:
  
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature
-@@ -291,6 +295,7 @@ void usage(enum logcode F)
+@@ -296,6 +300,7 @@ void usage(enum logcode F)
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
    rprintf(F," -p, --perms                 preserve permissions\n");
    rprintf(F," -A, --acls                  preserve ACLs (implies --perms)\n");
@@ -242,7 +242,7 @@ After applying this patch, run these commands for a successful build:
    rprintf(F," -o, --owner                 preserve owner (root only)\n");
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
-@@ -397,6 +402,9 @@ static struct poptOption long_options[] 
+@@ -404,6 +409,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 },
@@ -252,7 +252,7 @@ After applying this patch, run these commands for a successful build:
    {"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 },
-@@ -994,6 +1002,17 @@ int parse_arguments(int *argc, const cha
+@@ -1021,6 +1029,17 @@ int parse_arguments(int *argc, const cha
                        return 0;
  #endif /* SUPPORT_ACLS */
  
@@ -270,7 +270,7 @@ After applying this patch, run these commands for a successful build:
  
                default:
                        /* A large opt value means that set_refuse_options()
-@@ -1418,6 +1437,8 @@ void server_options(char **args,int *arg
+@@ -1451,6 +1470,8 @@ void server_options(char **args,int *arg
                argstr[x++] = 'H';
        if (preserve_acls)
                argstr[x++] = 'A';
@@ -351,7 +351,7 @@ After applying this patch, run these commands for a successful build:
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
-@@ -672,6 +673,11 @@ ACLs to be the same as the local ACLs.  
+@@ -674,6 +675,11 @@ ACLs to be the same as the local ACLs.  
  remote machine's rsync supports this option also. This is a non-standard
  option.