Fixed failing hunks.

[rsync/rsync-patches.git] / chmod-option.diff

diff --git a/chmod-option.diff b/chmod-option.diff
index d776e2f..614df78 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -225,8 +225,8 @@ command before "make":
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
---- orig/options.c     2005-02-15 19:27:05
-+++ options.c  2005-02-15 19:33:30
+--- orig/options.c     2005-02-16 15:35:53
++++ options.c  2005-02-16 15:38:40
 @@ -132,6 +132,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
@@ -235,7 +235,7 @@ command before "make":
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;
-@@ -148,6 +149,8 @@ int list_only = 0;
+@@ -149,6 +150,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;
-@@ -275,6 +278,7 @@ void usage(enum logcode F)
+@@ -276,6 +279,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,7 +252,7 @@ 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");
-@@ -393,6 +397,7 @@ static struct poptOption long_options[] 
+@@ -394,6 +398,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 },
@@ -260,7 +260,7 @@ command before "make":
    {"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 },
-@@ -1050,6 +1055,13 @@ int parse_arguments(int *argc, const cha
+@@ -1058,6 +1063,13 @@ int parse_arguments(int *argc, const cha
                return 0;
        }
  
@@ -271,10 +271,10 @@ command before "make":
 +              return 0;
 +      }
 +
-       if (do_progress && !verbose && !itemize_changes) {
-               if (refused_verbose) {
-                       create_refuse_error(refused_verbose);
-@@ -1374,6 +1386,11 @@ void server_options(char **args,int *arg
+       if (log_format) {
+               if (strstr(log_format, "%i") != NULL)
+                       itemize_changes = 1;
+@@ -1392,6 +1404,11 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -286,7 +286,7 @@ command before "make":
        if (files_from && (!am_sender || remote_filesfrom_file)) {
                if (remote_filesfrom_file) {
                        args[ac++] = "--files-from";
---- orig/rsync.yo      2005-02-15 19:27:05
+--- orig/rsync.yo      2005-02-16 15:35:54
 +++ rsync.yo   2005-01-24 01:48:43
 @@ -322,6 +322,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)