Updated to apply cleanly.

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

diff --git a/chmod-option.diff b/chmod-option.diff
index 4b57fd2606edd8654766362a75bdb79837806d60..53665c1b7beb7aa9b97e2722e2074f5f89191de6 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -4,7 +4,7 @@ command before "make":
     make proto
 
 
---- orig/Makefile.in   2004-11-03 11:56:03
+--- orig/Makefile.in   2004-11-02 16:47:15
 +++ 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,9 +202,9 @@ command before "make":
 +      }
 +      return 0;
 +}
---- orig/flist.c       2005-02-26 19:27:54
+--- orig/flist.c       2005-03-16 02:19:29.897764030
 +++ flist.c    2004-09-18 01:51:11
-@@ -62,6 +62,8 @@ extern int orig_umask;
+@@ -62,6 +62,8 @@ extern struct file_list *the_file_list;
  
  extern char curr_dir[MAXPATHLEN];
  
@@ -225,7 +225,7 @@ command before "make":
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
---- orig/options.c     2005-03-01 01:22:59
+--- orig/options.c     2005-03-16 02:19:30.152741841
 +++ options.c  2005-03-01 01:26:56
 @@ -140,6 +140,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -235,7 +235,7 @@ command before "make":
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
  int compare_dest = 0;
-@@ -158,6 +159,8 @@ int list_only = 0;
+@@ -160,6 +161,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;
-@@ -285,6 +288,7 @@ void usage(enum logcode F)
+@@ -286,6 +289,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");
-@@ -404,6 +408,7 @@ static struct poptOption long_options[] 
+@@ -406,6 +410,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_VAL,    &omit_dir_times, 2, 0, 0 },
-@@ -1073,6 +1078,13 @@ int parse_arguments(int *argc, const cha
+@@ -1081,6 +1086,13 @@ int parse_arguments(int *argc, const cha
        if (make_backups && !backup_dir)
                omit_dir_times = 1;
  
@@ -274,7 +274,7 @@ command before "make":
        if (log_format) {
                if (strstr(log_format, "%i") != NULL)
                        log_format_has_i = 1;
-@@ -1435,6 +1447,11 @@ void server_options(char **args,int *arg
+@@ -1443,6 +1455,11 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -286,9 +286,9 @@ command before "make":
        if (files_from && (!am_sender || filesfrom_host)) {
                if (filesfrom_host) {
                        args[ac++] = "--files-from";
---- orig/rsync.yo      2005-03-01 01:22:59
+--- orig/rsync.yo      2005-03-16 02:19:30.727691806
 +++ rsync.yo   2005-01-24 01:48:43
-@@ -322,6 +322,7 @@ to the detailed description below for a 
+@@ -321,6 +321,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)
   -t, --times                 preserve times
   -O, --omit-dir-times        omit directories when preserving times