Fixed patch fuzz.

diff --git a/chmod-option.diff b/chmod-option.diff
index 5f59c54..06c0b16 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -202,9 +202,9 @@ command before "make":
 +      }
 +      return 0;
 +}
---- orig/flist.c       2005-02-20 00:16:35
+--- orig/flist.c       2005-02-21 10:51:51
 +++ flist.c    2004-09-18 01:51:11
-@@ -65,6 +65,8 @@ extern char *log_format;
+@@ -70,6 +70,8 @@ extern int backup_suffix_len;
  
  extern char curr_dir[MAXPATHLEN];
  
@@ -213,7 +213,7 @@ command before "make":
  extern struct filter_list_struct filter_list;
  extern struct filter_list_struct server_filter_list;
  
-@@ -882,7 +884,10 @@ skip_filters:
+@@ -887,7 +889,10 @@ skip_filters:
        file->flags = flags;
        file->modtime = st.st_mtime;
        file->length = st.st_size;
@@ -225,9 +225,9 @@ command before "make":
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
---- orig/options.c     2005-02-20 01:12:42
+--- orig/options.c     2005-02-21 10:51:52
 +++ options.c  2005-02-16 15:38:40
-@@ -134,6 +134,7 @@ char *log_format = NULL;
+@@ -139,6 +139,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
@@ -235,7 +235,7 @@ command before "make":
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;
-@@ -153,6 +154,8 @@ int list_only = 0;
+@@ -158,6 +159,8 @@ int list_only = 0;
  #define MAX_BATCH_NAME_LEN 256        /* Must be less than MAXPATHLEN-13 */
  char *batch_name = NULL;
  
@@ -244,7 +244,7 @@ command before "make":
  static int daemon_opt;   /* sets am_daemon after option error-reporting */
  static int F_option_cnt = 0;
  static int modify_window_set;
-@@ -280,6 +283,7 @@ void usage(enum logcode F)
+@@ -285,6 +288,7 @@ void usage(enum logcode F)
    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -t, --times                 preserve times\n");
    rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
@@ -252,17 +252,17 @@ command before "make":
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
    rprintf(F," -W, --whole-file            copy files whole (without rsync algorithm)\n");
-@@ -400,6 +404,7 @@ static struct poptOption long_options[] 
+@@ -405,6 +409,7 @@ static struct poptOption long_options[] 
    {"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 },
 +  {"chmod",            0,  POPT_ARG_STRING, &chmod_mode, 0, 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 },
-@@ -1082,6 +1087,13 @@ int parse_arguments(int *argc, const cha
-               return 0;
-       }
+   {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
+@@ -1091,6 +1096,13 @@ int parse_arguments(int *argc, const cha
+       if (make_backups && !backup_dir)
+               omit_dir_times = 1;
  
 +      if (chmod_mode && !(chmod_modes = parse_chmod(chmod_mode))) {
 +              snprintf(err_buf, sizeof err_buf,
@@ -274,7 +274,7 @@ command before "make":
        if (log_format) {
                if (strstr(log_format, "%i") != NULL)
                        log_format_has_i = 1;
-@@ -1431,6 +1443,11 @@ void server_options(char **args,int *arg
+@@ -1440,6 +1452,11 @@ void server_options(char **args,int *arg
                }
        }