Fixed failing hunks.

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

diff --git a/owner-group-mod.diff b/owner-group-mod.diff
index c2f7d74..af3b4fb 100644 (file)
--- a/owner-group-mod.diff
+++ b/owner-group-mod.diff
@@ -34,20 +34,32 @@ groups, even if they weren't returned by getgroups().  E.g.:
 +                      preserve_gid = 2;
 +      }
  }
---- orig/options.c     2005-05-19 08:52:42
-+++ options.c  2004-09-09 01:59:08
-@@ -408,8 +408,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 },
--  {"owner",           'o', POPT_ARG_NONE,   &preserve_uid, 0, 0, 0 },
--  {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
-+  {"owner",           'o', POPT_ARG_NONE,   0,               'o', 0, 0 },
-+  {"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 },
+--- orig/options.c     2005-08-27 21:11:26
++++ options.c  2005-08-27 21:26:04
+@@ -390,10 +390,10 @@ static struct poptOption long_options[] 
+   {"no-t",             0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
-@@ -781,6 +781,14 @@ int parse_arguments(int *argc, const cha
+   {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
+-  {"owner",           'o', POPT_ARG_VAL,    &preserve_uid, 1, 0, 0 },
++  {"owner",           'o', POPT_ARG_NONE,   0, 'o', 0, 0 },
+   {"no-owner",         0,  POPT_ARG_VAL,    &preserve_uid, 0, 0, 0 },
+   {"no-o",             0,  POPT_ARG_VAL,    &preserve_uid, 0, 0, 0 },
+-  {"group",           'g', POPT_ARG_VAL,    &preserve_gid, 1, 0, 0 },
++  {"group",           'g', POPT_ARG_NONE,   0, 'g', 0, 0 },
+   {"no-group",         0,  POPT_ARG_VAL,    &preserve_gid, 0, 0, 0 },
+   {"no-g",             0,  POPT_ARG_VAL,    &preserve_gid, 0, 0, 0 },
+   {"devices",         'D', POPT_ARG_VAL,    &preserve_devices, 1, 0, 0 },
+@@ -812,7 +812,8 @@ int parse_arguments(int *argc, const cha
+ #endif
+                       preserve_perms = 1;
+                       preserve_times = 1;
+-                      preserve_gid = 1;
++                      preserve_uid |= 1;
++                      preserve_gid |= 1;
+                       preserve_uid = 1;
+                       preserve_devices = 1;
+                       break;
+@@ -821,6 +822,14 @@ int parse_arguments(int *argc, const cha
                        usage(FINFO);
                        exit_cleanup(0);
  
@@ -62,18 +74,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
                case 'v':
                        verbose++;
                        break;
-@@ -963,8 +971,8 @@ int parse_arguments(int *argc, const cha
- #endif
-               preserve_perms = 1;
-               preserve_times = 1;
--              preserve_gid = 1;
--              preserve_uid = 1;
-+              preserve_uid |= 1;
-+              preserve_gid |= 1;
-               preserve_devices = 1;
-       }
- 
-@@ -1282,10 +1290,16 @@ void server_options(char **args,int *arg
+@@ -1329,10 +1338,16 @@ void server_options(char **args,int *arg
  
        if (preserve_hard_links)
                argstr[x++] = 'H';
@@ -92,7 +93,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
        if (preserve_devices)
                argstr[x++] = 'D';
        if (preserve_times)
---- orig/rsync.c       2005-03-16 02:19:30
+--- orig/rsync.c       2005-07-27 23:31:12
 +++ rsync.c    2005-02-01 10:46:04
 @@ -27,7 +27,6 @@ extern int dry_run;
  extern int daemon_log_format_has_i;
@@ -102,8 +103,8 @@ groups, even if they weren't returned by getgroups().  E.g.:
  extern int am_server;
  extern int am_sender;
  extern int am_generator;
-@@ -81,7 +80,7 @@ int set_perms(char *fname,struct file_st
-               updated = 1;
+@@ -82,7 +81,7 @@ int set_perms(char *fname,struct file_st
+                       updated = 1;
        }
  
 -      change_uid = am_root && preserve_uid && st->st_uid != file->uid;