X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fc068916893d69f75d9eab25b5ebd46ed5341683..8f1c03c8a49ff093819e3097b36577953d4307a4:/time-limit.diff

diff --git a/time-limit.diff b/time-limit.diff
index 9d43c89..55c7086 100644
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -11,7 +11,7 @@ To use this patch, run these commands for a successful build:
 
 --- old/io.c
 +++ new/io.c
-@@ -53,6 +53,7 @@ extern int remove_source_files;
+@@ -52,6 +52,7 @@ extern int remove_source_files;
  extern int preserve_hard_links;
  extern char *filesfrom_host;
  extern struct stats stats;
@@ -19,7 +19,7 @@ To use this patch, run these commands for a successful build:
  extern struct file_list *cur_flist, *first_flist;
  
  const char phase_unknown[] = "unknown";
-@@ -173,16 +174,24 @@ static void check_timeout(void)
+@@ -172,16 +173,24 @@ static void check_timeout(void)
  {
  	time_t t;
  
@@ -49,7 +49,7 @@ To use this patch, run these commands for a successful build:
  			rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
 --- old/options.c
 +++ new/options.c
-@@ -106,6 +106,7 @@ size_t bwlimit_writemax = 0;
+@@ -108,6 +108,7 @@ size_t bwlimit_writemax = 0;
  int ignore_existing = 0;
  int ignore_non_existing = 0;
  int need_messages_from_generator = 0;
@@ -57,7 +57,7 @@ To use this patch, run these commands for a successful build:
  int max_delete = -1;
  OFF_T max_size = 0;
  OFF_T min_size = 0;
-@@ -374,6 +375,8 @@ void usage(enum logcode F)
+@@ -390,6 +391,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,7 +66,7 @@ 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");
-@@ -395,7 +398,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -411,7 +414,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,
@@ -75,7 +75,7 @@ To use this patch, run these commands for a successful build:
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -514,6 +517,8 @@ static struct poptOption long_options[] 
+@@ -540,6 +543,8 @@ static struct poptOption long_options[] 
    {"log-format",       0,  POPT_ARG_STRING, &stdout_format, 0, 0, 0 }, /* DEPRECATED */
    {"itemize-changes", 'i', POPT_ARG_NONE,   0, 'i', 0, 0 },
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
@@ -84,9 +84,9 @@ To use this patch, run these commands for a successful build:
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
    {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-@@ -1093,6 +1098,36 @@ int parse_arguments(int *argc, const cha
- 			usage(FINFO);
- 			exit_cleanup(0);
+@@ -1148,6 +1153,36 @@ int parse_arguments(int *argc, const cha
+ 			return 0;
+ #endif
  
 +		case OPT_STOP_AT:
 +			arg = poptGetOptArg(pc);
@@ -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. */
-@@ -1656,6 +1691,15 @@ void server_options(char **args,int *arg
+@@ -1715,6 +1750,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
-@@ -395,6 +395,8 @@ to the detailed description below for a 
+@@ -397,6 +397,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
-@@ -1748,6 +1750,19 @@ transfer was too fast, it will wait befo
+@@ -1797,6 +1799,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.
  
@@ -170,7 +170,7 @@ To use this patch, run these commands for a successful build:
  section for details, and also the bf(--only-write-batch) option.
 --- old/util.c
 +++ new/util.c
-@@ -121,6 +121,133 @@ NORETURN void overflow_exit(const char *
+@@ -120,6 +120,133 @@ NORETURN void overflow_exit(const char *
  	exit_cleanup(RERR_MALLOC);
  }