Got rid of patch fuzz.

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

diff --git a/owner-group-mod.diff b/owner-group-mod.diff
index c95251d..44f9606 100644 (file)
--- a/owner-group-mod.diff
+++ b/owner-group-mod.diff
@@ -34,11 +34,11 @@ groups, even if they weren't returned by getgroups().  E.g.:
 +                      preserve_gid = 2;
 +      }
  }
---- orig/options.c     2005-02-14 02:45:10
+--- orig/options.c     2005-02-15 19:27:05
 +++ options.c  2004-09-09 01:59:08
-@@ -389,8 +389,8 @@ static struct poptOption long_options[] 
+@@ -391,8 +391,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 },
@@ -47,7 +47,7 @@ groups, even if they weren't returned by getgroups().  E.g.:
    {"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 },
-@@ -719,6 +719,14 @@ int parse_arguments(int *argc, const cha
+@@ -722,6 +722,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;
-@@ -929,8 +937,8 @@ int parse_arguments(int *argc, const cha
+@@ -932,8 +940,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;
        }
  
-@@ -1206,10 +1214,16 @@ void server_options(char **args,int *arg
- 
+@@ -1211,10 +1219,16 @@ void server_options(char **args,int *arg
+               argstr[x++] = 'i';
        if (preserve_hard_links)
                argstr[x++] = 'H';
 -      if (preserve_uid)