X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/0b2c07a0f162b8704df278209b4de836f1c846de..5ba66156c2f3b31eae4a1ae88a44c1efaf248c9c:/time-limit.diff

diff --git a/time-limit.diff b/time-limit.diff
index 07b79ba..10acf14 100644
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -57,7 +57,7 @@ To use this patch, run these commands for a successful build:
  int max_delete = INT_MIN;
  OFF_T max_size = 0;
  OFF_T min_size = 0;
-@@ -407,6 +408,8 @@ void usage(enum logcode F)
+@@ -413,6 +414,8 @@ void usage(enum logcode F)
    rprintf(F,"     --password-file=FILE    read daemon-access password from FILE\n");
    rprintf(F,"     --list-only             list the files instead of copying them\n");
    rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth; KBytes per second\n");
@@ -66,16 +66,16 @@ To use this patch, run these commands for a successful build:
    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");
-@@ -431,7 +434,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -435,7 +438,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
--      OPT_NO_D,
-+      OPT_NO_D, OPT_STOP_AT, OPT_TIME_LIMIT,
+-      OPT_NO_D, OPT_APPEND,
++      OPT_NO_D, OPT_APPEND, OPT_STOP_AT, OPT_TIME_LIMIT,
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -587,6 +590,8 @@ static struct poptOption long_options[] 
+@@ -593,6 +596,8 @@ static struct poptOption long_options[] 
    {"no-numeric-ids",   0,  POPT_ARG_VAL,    &numeric_ids, 0, 0, 0 },
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
    {"no-timeout",       0,  POPT_ARG_VAL,    &io_timeout, 0, 0, 0 },
@@ -84,7 +84,7 @@ To use this patch, run these commands for a successful build:
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
    {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
-@@ -1198,6 +1203,36 @@ int parse_arguments(int *argc, const cha
+@@ -1205,6 +1210,36 @@ int parse_arguments(int *argc, const cha
  			return 0;
  #endif
  
@@ -121,7 +121,7 @@ To use this patch, run these commands for a successful build:
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off. */
-@@ -1796,6 +1831,15 @@ void server_options(char **args,int *arg
+@@ -1803,6 +1838,15 @@ void server_options(char **args,int *arg
  		args[ac++] = arg;
  	}
  
@@ -139,7 +139,7 @@ To use this patch, run these commands for a successful build:
  		args[ac++] = backup_dir;
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -420,6 +420,8 @@ to the detailed description below for a 
+@@ -421,6 +421,8 @@ to the detailed description below for a 
       --password-file=FILE    read daemon-access password from FILE
       --list-only             list the files instead of copying them
       --bwlimit=KBPS          limit I/O bandwidth; KBytes per second
@@ -148,7 +148,7 @@ To use this patch, run these commands for a successful build:
       --write-batch=FILE      write a batched update to FILE
       --only-write-batch=FILE like --write-batch but w/o updating dest
       --read-batch=FILE       read a batched update from FILE
-@@ -1892,6 +1894,19 @@ transfer was too fast, it will wait befo
+@@ -1902,6 +1904,19 @@ transfer was too fast, it will wait befo
  result is an average transfer rate equaling the specified limit. A value
  of zero specifies no limit.