This is now on the trunk.

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

diff --git a/flags.diff b/flags.diff
index 69dcc3f..5ce44cc 100644 (file)
--- a/flags.diff
+++ b/flags.diff
@@ -12,7 +12,7 @@ TODO: fix --delete-delay to work with --flags option.
 
 --- old/compat.c
 +++ new/compat.c
-@@ -64,6 +64,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -94,6 +94,8 @@ void setup_protocol(int f_out,int f_in)
                preserve_uid = ++file_extra_cnt;
        if (preserve_gid)
                preserve_gid = ++file_extra_cnt;
@@ -291,19 +291,18 @@ TODO: fix --delete-delay to work with --flags option.
 +      char const *fileflags = "no ";
        STRUCT_STAT *dumstat;
  
- #ifdef HAVE_SOCKETPAIR
-@@ -234,6 +236,10 @@ static void print_rsync_version(enum log
+ #if SUBPROTOCOL_VERSION != 0
+@@ -232,6 +234,9 @@ static void print_rsync_version(enum log
+ #ifdef INET6
        ipv6 = "";
  #endif
- 
 +#ifdef SUPPORT_FLAGS
 +      fileflags = "";
 +#endif
-+
-       if (SUBPROTOCOL_VERSION)
-               snprintf(buf, sizeof buf, ".PR%d", SUBPROTOCOL_VERSION);
-       else
-@@ -250,8 +256,8 @@ static void print_rsync_version(enum log
+ 
+       rprintf(f, "%s  version %s  protocol version %d%s\n",
+               RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
+@@ -245,8 +250,8 @@ static void print_rsync_version(enum log
                (int)(sizeof (int64) * 8));
        rprintf(f, "    %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
                got_socketpair, hardlinks, links, ipv6, have_inplace);
@@ -314,7 +313,7 @@ TODO: fix --delete-delay to work with --flags option.
  
  #ifdef MAINTAINER_MODE
        rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-@@ -317,6 +323,7 @@ void usage(enum logcode F)
+@@ -312,6 +317,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");
@@ -322,7 +321,7 @@ TODO: fix --delete-delay to work with --flags option.
    rprintf(F," -E, --executability         preserve the file's executability\n");
    rprintf(F,"     --chmod=CHMOD           affect file and/or directory permissions\n");
  #ifdef SUPPORT_ACLS
-@@ -448,6 +455,8 @@ static struct poptOption long_options[] 
+@@ -443,6 +449,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 },
@@ -331,7 +330,7 @@ TODO: fix --delete-delay to work with --flags option.
    {"executability",   'E', POPT_ARG_NONE,   &preserve_executability, 0, 0, 0 },
    {"acls",            'A', POPT_ARG_NONE,   0, 'A', 0, 0 },
    {"no-acls",          0,  POPT_ARG_VAL,    &preserve_acls, 0, 0, 0 },
-@@ -1194,6 +1203,15 @@ int parse_arguments(int *argc, const cha
+@@ -1189,6 +1197,15 @@ int parse_arguments(int *argc, const cha
        }
  #endif
  
@@ -347,7 +346,7 @@ TODO: fix --delete-delay to work with --flags option.
        if (write_batch && read_batch) {
                snprintf(err_buf, sizeof err_buf,
                        "--write-batch and --read-batch can not be used together\n");
-@@ -1661,6 +1679,9 @@ void server_options(char **args,int *arg
+@@ -1665,6 +1682,9 @@ void server_options(char **args,int *arg
        if (xfer_dirs && !recurse && delete_mode && am_sender)
                args[ac++] = "--no-r";