Fixed failing hunks.

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

diff --git a/owner-group-mod.diff b/owner-group-mod.diff
index 19f1e7c..fb0eb67 100644 (file)
--- a/owner-group-mod.diff
+++ b/owner-group-mod.diff
@@ -31,9 +31,9 @@ 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-01-24 01:43:10
 +++ options.c  2004-09-09 01:59:08
-@@ -358,8 +358,8 @@ static struct poptOption long_options[] 
+@@ -371,8 +371,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 },
@@ -43,8 +43,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_NONE,   &omit_dir_times, 0, 0, 0 },
+@@ -654,6 +654,14 @@ int parse_arguments(int *argc, const cha
                        usage(FINFO);
                        exit_cleanup(0);
  
@@ -59,7 +59,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
+@@ -849,8 +857,8 @@ int parse_arguments(int *argc, const cha
  #endif
                preserve_perms = 1;
                preserve_times = 1;
@@ -70,7 +70,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
+@@ -1080,10 +1088,16 @@ void server_options(char **args,int *arg
  
        if (preserve_hard_links)
                argstr[x++] = 'H';
@@ -89,17 +89,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;
+--- orig/rsync.c       2005-01-24 00:57:24
++++ rsync.c    2005-01-24 02:07:24
+@@ -26,7 +26,6 @@ extern int verbose;
  extern int dry_run;
  extern int preserve_times;
+ extern int omit_dir_times;
 -extern int am_root;
  extern int am_sender;
  extern int am_generator;
  extern int preserve_uid;
-@@ -158,7 +157,7 @@ int set_perms(char *fname,struct file_st
+@@ -179,7 +178,7 @@ int set_perms(char *fname,struct file_st
                updated = 1;
        }
  
@@ -107,7 +107,7 @@ 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) {
+ #if !HAVE_LCHOWN && !CHOWN_MODIFIES_SYMLINK
 --- orig/uidlist.c     2004-04-29 19:37:25
 +++ uidlist.c  2004-09-09 01:59:08
 @@ -35,7 +35,6 @@ extern int verbose;