A patch from Antti Tapaninen.

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

diff --git a/flags.diff b/flags.diff
index f1006c2..13e7e4b 100644 (file)
--- a/flags.diff
+++ b/flags.diff
@@ -104,7 +104,7 @@ Modified from a patch that was written by Rolf Grossmann:
  
 --- old/generator.c
 +++ new/generator.c
-@@ -124,6 +124,9 @@ static int delete_item(char *fname, int 
+@@ -123,6 +123,9 @@ static int delete_item(char *fname, int 
        if (!S_ISDIR(mode)) {
                if (max_delete && ++deletion_count > max_delete)
                        return 0;
@@ -114,7 +114,7 @@ Modified from a patch that was written by Rolf Grossmann:
                if (make_backups && (backup_dir || !is_backup_file(fname)))
                        ok = make_backup(fname);
                else
-@@ -148,10 +151,17 @@ static int delete_item(char *fname, int 
+@@ -147,10 +150,17 @@ static int delete_item(char *fname, int 
                ok = 0;
                errno = ENOTEMPTY;
        } else if (make_backups && !backup_dir && !is_backup_file(fname)
@@ -175,7 +175,7 @@ Modified from a patch that was written by Rolf Grossmann:
                (int) (sizeof dumstat->st_ino * 8),
                (int) (sizeof (int64) * 8));
  #ifdef MAINTAINER_MODE
-@@ -298,6 +304,7 @@ void usage(enum logcode F)
+@@ -302,6 +308,7 @@ void usage(enum logcode F)
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
    rprintf(F," -H, --hard-links            preserve hard links\n");
    rprintf(F," -p, --perms                 preserve permissions\n");
@@ -183,7 +183,7 @@ Modified from a patch that was written by Rolf Grossmann:
    rprintf(F," -E, --executability         preserve the file's executability\n");
    rprintf(F,"     --chmod=CHMOD           change destination permissions\n");
    rprintf(F," -o, --owner                 preserve owner (super-user only)\n");
-@@ -414,6 +421,8 @@ static struct poptOption long_options[] 
+@@ -420,6 +427,8 @@ static struct poptOption long_options[] 
    {"perms",           'p', POPT_ARG_VAL,    &preserve_perms, 1, 0, 0 },
    {"no-perms",         0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
    {"no-p",             0,  POPT_ARG_VAL,    &preserve_perms, 0, 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 },
-@@ -1119,6 +1128,15 @@ int parse_arguments(int *argc, const cha
+@@ -1122,6 +1131,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");
-@@ -1577,6 +1595,9 @@ void server_options(char **args,int *arg
+@@ -1579,6 +1597,9 @@ void server_options(char **args,int *arg
        if (xfer_dirs && !recurse && delete_mode && am_sender)
                args[ac++] = "--no-r";
  
@@ -220,15 +220,15 @@ Modified from a patch that was written by Rolf Grossmann:
                        goto oom;
 --- old/rsync.c
 +++ new/rsync.c
-@@ -34,6 +34,7 @@ extern int verbose;
+@@ -33,6 +33,7 @@
+ extern int verbose;
  extern int dry_run;
- extern int logfile_format_has_i;
  extern int preserve_perms;
 +extern int preserve_flags;
  extern int preserve_executability;
  extern int preserve_times;
  extern int omit_dir_times;
-@@ -217,6 +218,19 @@ int set_file_attrs(char *fname, struct f
+@@ -216,6 +217,19 @@ int set_file_attrs(char *fname, struct f
        }
  #endif
  
@@ -246,9 +246,9 @@ Modified from a patch that was written by Rolf Grossmann:
 +#endif
 +
        if (verbose > 1 && flags & ATTRS_REPORT) {
-               enum logcode code = logfile_format_has_i || dry_run
-                                 ? FCLIENT : FINFO;
-@@ -252,6 +266,10 @@ void finish_transfer(char *fname, char *
+               if (updated)
+                       rprintf(FCLIENT, "%s\n", fname);
+@@ -249,6 +263,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);
-@@ -305,3 +323,21 @@ const char *who_am_i(void)
+@@ -302,3 +320,21 @@ const char *who_am_i(void)
                return am_server ? "server" : "client";
        return am_sender ? "sender" : am_generator ? "generator" : "receiver";
  }
@@ -322,7 +322,7 @@ Modified from a patch that was written by Rolf Grossmann:
   -o, --owner                 preserve owner (super-user only)
   -g, --group                 preserve group
       --devices               preserve device files (super-user only)
-@@ -500,7 +501,9 @@ specified, in which case bf(-r) is not i
+@@ -502,7 +503,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-":
-@@ -795,6 +798,13 @@ quote(itemize(
+@@ -797,6 +800,13 @@ quote(itemize(
  
  If bf(--perms) is enabled, this option is ignored.