Fixed a failing hunk.

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

diff --git a/chmod-option.diff b/chmod-option.diff
index b425d90..fcdec40 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -4,7 +4,7 @@ command before "make":
     make proto
 
 
---- orig/Makefile.in   2004-08-13 07:18:58
+--- orig/Makefile.in   2004-11-03 11:56:03
 +++ Makefile.in        2004-07-03 20:13:41
 @@ -34,7 +34,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
@@ -202,17 +202,9 @@ command before "make":
 +      }
 +      return 0;
 +}
---- orig/flist.c       2004-08-12 18:34:38
-+++ flist.c    2004-07-03 20:13:41
-@@ -33,6 +33,7 @@ extern int verbose;
- extern int do_progress;
- extern int am_root;
- extern int am_server;
-+extern int am_sender;
- extern int am_daemon;
- extern int always_checksum;
- extern int module_id;
-@@ -64,6 +65,8 @@ extern int delete_excluded;
+--- orig/flist.c       2004-09-21 09:40:27
++++ flist.c    2004-09-18 01:51:11
+@@ -65,6 +65,8 @@ extern int delete_excluded;
  extern int orig_umask;
  extern int list_only;
  
@@ -221,7 +213,7 @@ command before "make":
  extern struct exclude_list_struct exclude_list;
  extern struct exclude_list_struct server_exclude_list;
  extern struct exclude_list_struct local_exclude_list;
-@@ -867,7 +870,10 @@ skip_excludes:
+@@ -869,7 +871,10 @@ skip_excludes:
        file->flags = flags;
        file->modtime = st.st_mtime;
        file->length = st.st_size;
@@ -233,17 +225,17 @@ command before "make":
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
---- orig/options.c     2004-08-12 18:34:38
+--- orig/options.c     2004-11-27 18:27:35
 +++ options.c  2004-07-03 20:13:41
-@@ -126,6 +126,7 @@ char *log_format = NULL;
+@@ -128,6 +128,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
 +char *chmod_mode = NULL;
  char backup_dir_buf[MAXPATHLEN];
- int rsync_port = RSYNC_PORT;
- int link_dest = 0;
-@@ -138,6 +139,8 @@ int list_only = 0;
+ int rsync_port = 0;
+ int compare_dest = 0;
+@@ -141,6 +142,8 @@ int list_only = 0;
  #define MAX_BATCH_NAME_LEN 256        /* Must be less than MAXPATHLEN-13 */
  char *batch_name = NULL;
  
@@ -251,8 +243,8 @@ command before "make":
 +
  static int daemon_opt;   /* sets am_daemon after option error-reporting */
  static int modify_window_set;
- 
-@@ -253,6 +256,7 @@ void usage(enum logcode F)
+ static char *dest_option = NULL;
+@@ -260,6 +263,7 @@ void usage(enum logcode F)
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -t, --times                 preserve times\n");
@@ -260,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 whole files, no incremental checks\n");
-@@ -360,6 +364,7 @@ static struct poptOption long_options[] 
+@@ -363,6 +367,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 },
@@ -268,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 },
    {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
-@@ -808,6 +813,13 @@ int parse_arguments(int *argc, const cha
+@@ -932,6 +937,13 @@ int parse_arguments(int *argc, const cha
                return 0;
        }
  
@@ -282,8 +274,8 @@ command before "make":
        if (do_progress && !verbose)
                verbose = 1;
  
-@@ -1078,6 +1090,11 @@ void server_options(char **args,int *arg
-               args[ac++] = compare_dest;
+@@ -1225,6 +1237,11 @@ void server_options(char **args,int *arg
+               }
        }
  
 +      if (chmod_mode && !am_sender) {
@@ -294,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      2004-08-13 07:18:59
+--- orig/rsync.yo      2004-11-27 17:53:24
 +++ rsync.yo   2004-07-03 20:13:41
 @@ -330,6 +330,7 @@ verb(
   -g, --group                 preserve group
@@ -304,7 +296,7 @@ command before "make":
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy whole files, no incremental checks
-@@ -603,6 +604,14 @@ cause the next transfer to behave as if 
+@@ -619,6 +620,14 @@ cause the next transfer to behave as if 
  updated (though the rsync algorithm will make the update fairly efficient
  if the files haven't actually changed, you're much better off using -t).