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 19f1e7c..f56cc3f 100644 (file)
--- a/owner-group-mod.diff
+++ b/owner-group-mod.diff
@@ -5,21 +5,24 @@ groups, even if they weren't returned by getgroups().  E.g.:
 
     rsync -avoogg host:/from/ /to/
 
---- orig/compat.c      2004-07-21 23:59:35
-+++ compat.c   2004-09-09 01:59:08
-@@ -28,8 +28,11 @@
+--- 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 am_root;
  extern int am_server;
  extern int am_sender;
-+extern int preserve_uid;
-+extern int preserve_gid;
+ extern int fuzzy_basis;
  extern int read_batch;
  extern int checksum_seed;
++extern int preserve_uid;
++extern int preserve_gid;
  extern int protocol_version;
-@@ -81,4 +84,11 @@ void setup_protocol(int f_out,int f_in)
+ 
+ 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);
        }
@@ -31,11 +34,11 @@ groups, even if they weren't returned by getgroups().  E.g.:
 +                      preserve_gid = 2;
 +      }
  }
---- orig/options.c     2004-09-18 01:49:33
+--- orig/options.c     2005-02-25 18:44:31
 +++ options.c  2004-09-09 01:59:08
-@@ -358,8 +358,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 },
+   {"copy-unsafe-links",0,  POPT_ARG_NONE,   &copy_unsafe_links, 0, 0, 0 },
    {"perms",           'p', POPT_ARG_NONE,   &preserve_perms, 0, 0, 0 },
 -  {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
 -  {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
@@ -43,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 },
-   {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
-@@ -568,6 +568,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);
  
@@ -59,7 +62,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
                case 'v':
                        verbose++;
                        break;
-@@ -707,8 +715,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;
@@ -70,7 +73,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
                preserve_devices = 1;
        }
  
-@@ -934,10 +942,16 @@ void server_options(char **args,int *arg
+@@ -1259,10 +1267,16 @@ void server_options(char **args,int *arg
  
        if (preserve_hard_links)
                argstr[x++] = 'H';
@@ -89,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       2004-09-07 21:45:30
-+++ rsync.c    2004-09-09 01:59:08
-@@ -25,7 +25,6 @@
- extern int verbose;
- extern int dry_run;
+--- 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 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;
- extern int preserve_uid;
-@@ -158,7 +157,7 @@ int set_perms(char *fname,struct file_st
+@@ -82,7 +81,7 @@ int set_perms(char *fname,struct file_st
                updated = 1;
        }
  
@@ -107,8 +110,8 @@ groups, even if they weren't returned by getgroups().  E.g.:
 +      change_uid = preserve_uid > 1 && st->st_uid != file->uid;
        change_gid = preserve_gid && file->gid != GID_NONE
                && st->st_gid != file->gid;
-       if (change_uid || change_gid) {
---- orig/uidlist.c     2004-04-29 19:37:25
+ #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
+--- orig/uidlist.c     2005-02-14 02:45:11
 +++ uidlist.c  2004-09-09 01:59:08
 @@ -35,7 +35,6 @@ extern int verbose;
  extern int preserve_uid;