Fixed failing hunks.

[rsync/rsync-patches.git] / flags.diff

diff --git a/flags.diff b/flags.diff
index 13e7e4b..629c6bd 100644 (file)
--- a/flags.diff
+++ b/flags.diff
@@ -5,7 +5,7 @@ Modified from a patch that was written by Rolf Grossmann:
 
 --- old/configure.in
 +++ new/configure.in
-@@ -494,7 +494,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
+@@ -527,7 +527,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
      memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \
      strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
      setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
@@ -92,7 +92,7 @@ Modified from a patch that was written by Rolf Grossmann:
        file->uid = uid;
        file->gid = gid;
  
-@@ -855,6 +878,9 @@ struct file_struct *make_file(char *fnam
+@@ -857,6 +880,9 @@ struct file_struct *make_file(char *fnam
        file->modtime = st.st_mtime;
        file->length = st.st_size;
        file->mode = st.st_mode;
@@ -181,7 +181,7 @@ Modified from a patch that was written by Rolf Grossmann:
    rprintf(F," -p, --perms                 preserve permissions\n");
 +  rprintf(F,"     --flags                 preserve file flags\n");
    rprintf(F," -E, --executability         preserve the file's executability\n");
-   rprintf(F,"     --chmod=CHMOD           change destination permissions\n");
+   rprintf(F,"     --chmod=CHMOD           change the permissions of transferred files\n");
    rprintf(F," -o, --owner                 preserve owner (super-user only)\n");
 @@ -420,6 +427,8 @@ static struct poptOption long_options[] 
    {"perms",           'p', POPT_ARG_VAL,    &preserve_perms, 1, 0, 0 },
@@ -192,7 +192,7 @@ Modified from a patch that was written by Rolf Grossmann:
    {"executability",   'E', POPT_ARG_NONE,   &preserve_executability, 0, 0, 0 },
    {"times",           't', POPT_ARG_VAL,    &preserve_times, 1, 0, 0 },
    {"no-times",         0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
-@@ -1122,6 +1131,15 @@ int parse_arguments(int *argc, const cha
+@@ -1123,6 +1132,15 @@ int parse_arguments(int *argc, const cha
        }
  #endif
  
@@ -208,7 +208,7 @@ Modified from a patch that was written by Rolf Grossmann:
        if (write_batch && read_batch) {
                snprintf(err_buf, sizeof err_buf,
                        "--write-batch and --read-batch can not be used together\n");
-@@ -1579,6 +1597,9 @@ void server_options(char **args,int *arg
+@@ -1580,6 +1598,9 @@ void server_options(char **args,int *arg
        if (xfer_dirs && !recurse && delete_mode && am_sender)
                args[ac++] = "--no-r";
  
@@ -228,7 +228,7 @@ Modified from a patch that was written by Rolf Grossmann:
  extern int preserve_executability;
  extern int preserve_times;
  extern int omit_dir_times;
-@@ -216,6 +217,19 @@ int set_file_attrs(char *fname, struct f
+@@ -221,6 +222,19 @@ int set_file_attrs(char *fname, struct f
        }
  #endif
  
@@ -248,7 +248,7 @@ Modified from a patch that was written by Rolf Grossmann:
        if (verbose > 1 && flags & ATTRS_REPORT) {
                if (updated)
                        rprintf(FCLIENT, "%s\n", fname);
-@@ -249,6 +263,10 @@ void finish_transfer(char *fname, char *
+@@ -254,6 +268,10 @@ void finish_transfer(char *fname, char *
  {
        int ret;
  
@@ -259,7 +259,7 @@ Modified from a patch that was written by Rolf Grossmann:
        if (inplace) {
                if (verbose > 2)
                        rprintf(FINFO, "finishing %s\n", fname);
-@@ -302,3 +320,21 @@ const char *who_am_i(void)
+@@ -307,3 +325,21 @@ const char *who_am_i(void)
                return am_server ? "server" : "client";
        return am_sender ? "sender" : am_generator ? "generator" : "receiver";
  }
@@ -291,7 +291,7 @@ Modified from a patch that was written by Rolf Grossmann:
  
  /* These flags are used in the live flist data. */
  
-@@ -338,6 +339,10 @@ enum msgcode {
+@@ -344,6 +345,10 @@ enum msgcode {
  #define schar char
  #endif
  
@@ -302,7 +302,7 @@ Modified from a patch that was written by Rolf Grossmann:
  /* Find a variable that is either exactly 32-bits or longer.
   * If some code depends on 32-bit truncation, it will need to
   * take special action in a "#if SIZEOF_INT32 > 4" section. */
-@@ -520,6 +525,9 @@ struct file_struct {
+@@ -526,6 +531,9 @@ struct file_struct {
                struct hlink *links;
        } link_u;
        time_t modtime;
@@ -314,15 +314,15 @@ Modified from a patch that was written by Rolf Grossmann:
        mode_t mode;
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -322,6 +322,7 @@ to the detailed description below for a 
+@@ -320,6 +320,7 @@ to the detailed description below for a 
+  -K, --keep-dirlinks         treat symlinked dir on receiver as dir
+  -H, --hard-links            preserve hard links
   -p, --perms                 preserve permissions
-  -E, --executability         preserve executability
-      --chmod=CHMOD           change destination permissions
 +     --flags                 preserve file flags
+  -E, --executability         preserve executability
+      --chmod=CHMOD           change the permissions of transferred files
   -o, --owner                 preserve owner (super-user only)
-  -g, --group                 preserve group
-      --devices               preserve device files (super-user only)
-@@ -502,7 +503,9 @@ specified, in which case bf(-r) is not i
+@@ -503,7 +504,9 @@ specified, in which case bf(-r) is not i
  
  Note that bf(-a) bf(does not preserve hardlinks), because
  finding multiply-linked files is expensive.  You must separately
@@ -333,7 +333,7 @@ Modified from a patch that was written by Rolf Grossmann:
  
  dit(--no-OPTION) You may turn off one or more implied options by prefixing
  the option name with "no-".  Not all options may be prefixed with a "no-":
-@@ -797,6 +800,13 @@ quote(itemize(
+@@ -798,6 +801,13 @@ quote(itemize(
  
  If bf(--perms) is enabled, this option is ignored.