Updated to apply cleanly.

[rsync/rsync-patches.git] / owner-group-mod.diff

diff --git a/owner-group-mod.diff b/owner-group-mod.diff
index 7fca7bf..f56cc3f 100644 (file)
--- a/owner-group-mod.diff
+++ b/owner-group-mod.diff
@@ -5,12 +5,12 @@ groups, even if they weren't returned by getgroups().  E.g.:
 
     rsync -avoogg host:/from/ /to/
 
---- orig/compat.c      2005-02-19 09:27:48
-+++ compat.c   2005-02-19 09:33:44
-@@ -29,11 +29,14 @@ int remote_protocol = 0;
+--- orig/compat.c      2005-02-20 00:02:22
++++ compat.c   2005-02-20 00:09:11
+@@ -28,11 +28,14 @@
+ int remote_protocol = 0;
  
  extern int verbose;
- extern int itemize_changes;
 +extern int am_root;
  extern int am_server;
  extern int am_sender;
@@ -22,7 +22,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
  extern int protocol_version;
  
  void setup_protocol(int f_out,int f_in)
-@@ -93,4 +96,11 @@ void setup_protocol(int f_out,int f_in)
+@@ -89,4 +92,11 @@ void setup_protocol(int f_out,int f_in)
        } else {
                checksum_seed = read_int(f_in);
        }
@@ -34,9 +34,9 @@ groups, even if they weren't returned by getgroups().  E.g.:
 +                      preserve_gid = 2;
 +      }
  }
---- orig/options.c     2005-02-19 09:27:48
+--- orig/options.c     2005-02-25 18:44:31
 +++ options.c  2004-09-09 01:59:08
-@@ -393,8 +393,8 @@ static struct poptOption long_options[] 
+@@ -402,8 +402,8 @@ static struct poptOption long_options[] 
    {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
    {"copy-unsafe-links",0,  POPT_ARG_NONE,   &copy_unsafe_links, 0, 0, 0 },
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
@@ -46,8 +46,8 @@ groups, even if they weren't returned by getgroups().  E.g.:
 +  {"group",           'g', POPT_ARG_NONE,   0,               'g', 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
-   {"omit-dir-times",  'O', POPT_ARG_NONE,   &omit_dir_times, 0, 0, 0 },
-@@ -723,6 +723,14 @@ int parse_arguments(int *argc, const cha
+   {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
+@@ -744,6 +744,14 @@ int parse_arguments(int *argc, const cha
                        usage(FINFO);
                        exit_cleanup(0);
  
@@ -62,7 +62,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
                case 'v':
                        verbose++;
                        break;
-@@ -933,8 +941,8 @@ int parse_arguments(int *argc, const cha
+@@ -946,8 +954,8 @@ int parse_arguments(int *argc, const cha
  #endif
                preserve_perms = 1;
                preserve_times = 1;
@@ -73,8 +73,8 @@ groups, even if they weren't returned by getgroups().  E.g.:
                preserve_devices = 1;
        }
  
-@@ -1233,10 +1241,16 @@ void server_options(char **args,int *arg
-               argstr[x++] = 'i';
+@@ -1259,10 +1267,16 @@ void server_options(char **args,int *arg
+ 
        if (preserve_hard_links)
                argstr[x++] = 'H';
 -      if (preserve_uid)
@@ -92,17 +92,17 @@ groups, even if they weren't returned by getgroups().  E.g.:
        if (preserve_devices)
                argstr[x++] = 'D';
        if (preserve_times)
---- orig/rsync.c       2005-02-19 09:27:48
+--- orig/rsync.c       2005-02-25 18:44:31
 +++ rsync.c    2005-02-01 10:46:04
 @@ -27,7 +27,6 @@ extern int dry_run;
- extern int itemize_changes;
+ extern int daemon_log_format_has_i;
  extern int preserve_times;
  extern int omit_dir_times;
 -extern int am_root;
  extern int am_server;
  extern int am_sender;
  extern int am_generator;
-@@ -174,7 +173,7 @@ int set_perms(char *fname,struct file_st
+@@ -82,7 +81,7 @@ int set_perms(char *fname,struct file_st
                updated = 1;
        }