The patches for 3.0.9.

[rsync.git/patches.git] / stdout.diff

diff --git a/stdout.diff b/stdout.diff
index 9a7280ca0b5bb129b463af08353684f4b6f85ccc..fe64a0e3ad52ca5b48387235ebfc398cff7f65a4 100644 (file)
--- a/stdout.diff
+++ b/stdout.diff
@@ -7,10 +7,11 @@ To use this patch, run these commands for a successful build:
     ./configure                            (optional if already run)
     make
 
+based-on: 40afd365cc8ca968fd16e161d24df5b8a8a520cc
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -203,6 +203,7 @@ static int refused_delete, refused_archive_part, refused_compress;
+@@ -202,6 +202,7 @@ static int refused_delete, refused_archive_part, refused_compress;
  static int refused_partial, refused_progress, refused_delete_before;
  static int refused_delete_during;
  static int refused_inplace, refused_no_iconv;
@@ -26,7 +27,7 @@ diff --git a/options.c b/options.c
    rprintf(F,"     --write-batch=FILE      write a batched update to FILE\n");
    rprintf(F,"     --only-write-batch=FILE like --write-batch but w/o updating destination\n");
    rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
-@@ -630,6 +632,7 @@ static struct poptOption long_options[] = {
+@@ -644,6 +646,7 @@ static struct poptOption long_options[] = {
    {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
    {"blocking-io",      0,  POPT_ARG_VAL,    &blocking_io, 1, 0, 0 },
    {"no-blocking-io",   0,  POPT_ARG_VAL,    &blocking_io, 0, 0, 0 },
@@ -34,7 +35,7 @@ diff --git a/options.c b/options.c
    {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
    {"checksum-seed",    0,  POPT_ARG_INT,    &checksum_seed, 0, 0, 0 },
    {"server",           0,  POPT_ARG_NONE,   0, OPT_SERVER, 0, 0 },
-@@ -1259,6 +1262,13 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
+@@ -1274,6 +1277,13 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                }
        }
  
@@ -45,6 +46,6 @@ diff --git a/options.c b/options.c
 +                      setvbuf(stdout, NULL, _IOLBF, 0);
 +      }
 +
-       if (human_readable && argc == 2) {
+       if (human_readable && argc == 2 && !am_server) {
                /* Allow the old meaning of 'h' (--help) on its own. */
                usage(FINFO);