Updated to apply cleanly.

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

diff --git a/chmod-option.diff b/chmod-option.diff
index c7645b6..eb61b21 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -202,7 +202,7 @@ command before "make":
 +      }
 +      return 0;
 +}
---- orig/flist.c       2005-01-25 00:53:58
+--- orig/flist.c       2005-02-03 02:04:20
 +++ flist.c    2004-09-18 01:51:11
 @@ -70,6 +70,8 @@ extern int max_delete;
  extern int orig_umask;
@@ -213,7 +213,7 @@ command before "make":
  extern struct filter_list_struct filter_list;
  extern struct filter_list_struct server_filter_list;
  
-@@ -890,7 +892,10 @@ skip_excludes:
+@@ -886,7 +888,10 @@ skip_filters:
        file->flags = flags;
        file->modtime = st.st_mtime;
        file->length = st.st_size;
@@ -225,7 +225,7 @@ command before "make":
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
---- orig/options.c     2005-01-25 03:26:51
+--- orig/options.c     2005-02-01 10:39:22
 +++ options.c  2005-01-24 01:48:30
 @@ -132,6 +132,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -244,15 +244,15 @@ 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;
-@@ -267,6 +270,7 @@ void usage(enum logcode F)
+@@ -271,6 +274,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");
 +  rprintf(F,"     --chmod=CHMOD           change destination permissions\n");
    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");
-@@ -379,6 +383,7 @@ static struct poptOption long_options[] 
+   rprintf(F," -W, --whole-file            copy files whole\n");
+@@ -386,6 +390,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 },
-@@ -984,6 +989,13 @@ int parse_arguments(int *argc, const cha
+@@ -1004,6 +1009,13 @@ int parse_arguments(int *argc, const cha
                return 0;
        }
  
@@ -274,7 +274,7 @@ command before "make":
        if (do_progress && !verbose)
                verbose = 1;
  
-@@ -1277,6 +1289,11 @@ void server_options(char **args,int *arg
+@@ -1305,6 +1317,11 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -286,19 +286,19 @@ command before "make":
        if (files_from && (!am_sender || remote_filesfrom_file)) {
                if (remote_filesfrom_file) {
                        args[ac++] = "--files-from";
---- orig/rsync.yo      2005-01-25 03:26:51
+--- orig/rsync.yo      2005-02-01 10:39:23
 +++ rsync.yo   2005-01-24 01:48:43
-@@ -332,6 +332,7 @@ verb(
+@@ -322,6 +322,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
 +     --chmod=CHMOD           change destination permissions
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
-  -W, --whole-file            copy whole files, no incremental checks
-@@ -648,6 +649,14 @@ dit(bf(-O, --omit-dir-times)) This tells
- it is preserving modification times (see --times).  If NFS is sharing
- the directories on the receiving side, it is a good idea to use -O.
+  -W, --whole-file            copy files whole
+@@ -641,6 +642,14 @@ dit(bf(-O, --omit-dir-times)) This tells
+ it is preserving modification times (see bf(--times)).  If NFS is sharing
+ the directories on the receiving side, it is a good idea to use bf(-O).
  
 +dit(bf(--chmod)) This options tells rsync to apply the listed "chmod" pattern
 +to the permission of the files on the destination.  In addition to the normal