Fixed failing hunks.

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

diff --git a/chmod-option.diff b/chmod-option.diff
index efceaf0..4add86d 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -213,7 +213,7 @@ command before "make":
 +      }
 +      return 0;
 +}
---- orig/flist.c       2005-07-07 20:35:47
+--- orig/flist.c       2005-08-17 06:45:07
 +++ flist.c    2004-09-18 01:51:11
 @@ -62,6 +62,8 @@ extern struct file_list *the_file_list;
  
@@ -236,8 +236,8 @@ command before "make":
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
---- orig/options.c     2005-05-19 08:52:42
-+++ options.c  2005-03-01 01:26:56
+--- orig/options.c     2005-08-27 21:11:26
++++ options.c  2005-08-27 21:18:52
 @@ -141,6 +141,7 @@ char *log_format = NULL;
  char *password_file = NULL;
  char *rsync_path = RSYNC_PATH;
@@ -255,7 +255,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;
-@@ -287,6 +290,7 @@ void usage(enum logcode F)
+@@ -289,6 +292,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");
@@ -263,15 +263,15 @@ 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");
-@@ -410,6 +414,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 },
+@@ -411,6 +415,7 @@ static struct poptOption long_options[] 
+   {"no-relative",      0,  POPT_ARG_VAL,    &relative_paths, 0, 0, 0 },
+   {"no-R",             0,  POPT_ARG_VAL,    &relative_paths, 0, 0, 0 },
+   {"no-implied-dirs",  0,  POPT_ARG_VAL,    &implied_dirs, 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_VAL,    &omit_dir_times, 2, 0, 0 },
-@@ -1090,6 +1095,13 @@ int parse_arguments(int *argc, const cha
+   {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
+   {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
+   {"one-file-system", 'x', POPT_ARG_NONE,   &one_file_system, 0, 0, 0 },
+@@ -1122,6 +1127,13 @@ int parse_arguments(int *argc, const cha
        if (make_backups && !backup_dir)
                omit_dir_times = 1;
  
@@ -285,7 +285,7 @@ command before "make":
        if (log_format) {
                if (log_format_has(log_format, 'i'))
                        log_format_has_i = 1;
-@@ -1458,6 +1470,11 @@ void server_options(char **args,int *arg
+@@ -1507,6 +1519,11 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -297,9 +297,9 @@ command before "make":
        if (files_from && (!am_sender || filesfrom_host)) {
                if (filesfrom_host) {
                        args[ac++] = "--files-from";
---- orig/rsync.yo      2005-07-07 23:11:09
+--- orig/rsync.yo      2005-08-27 21:05:12
 +++ rsync.yo   2005-01-24 01:48:43
-@@ -311,6 +311,7 @@ to the detailed description below for a 
+@@ -323,6 +323,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
@@ -307,7 +307,7 @@ command before "make":
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy files whole (without rsync algorithm)
-@@ -648,6 +649,14 @@ it is preserving modification times (see
+@@ -695,6 +696,14 @@ it is preserving modification times (see
  the directories on the receiving side, it is a good idea to use bf(-O).
  This option is inferred if you use bf(--backup) without bf(--backup-dir).