X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/70891d2683929346847f5a7eccc135ee0352c4ec..41b674b3ed541263d70a10d7796aca5d6cd73e03:/time-limit.diff

diff --git a/time-limit.diff b/time-limit.diff
index 57ceac5..e0b0ce9 100644
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -9,17 +9,18 @@ To use this patch, run these commands for a successful build:
     ./configure                              (optional if already run)
     make
 
---- old/io.c
-+++ new/io.c
-@@ -50,6 +50,7 @@ extern int remove_source_files;
+diff --git a/io.c b/io.c
+--- a/io.c
++++ b/io.c
+@@ -54,6 +54,7 @@ extern int protocol_version;
+ extern int remove_source_files;
  extern int preserve_hard_links;
- extern char *filesfrom_host;
  extern struct stats stats;
 +extern time_t stop_at_utime;
- extern struct file_list *the_file_list;
- 
- const char phase_unknown[] = "unknown";
-@@ -166,16 +167,24 @@ static void check_timeout(void)
+ extern struct file_list *cur_flist;
+ #ifdef ICONV_OPTION
+ extern int filesfrom_convert;
+@@ -182,16 +183,24 @@ static void check_timeout(void)
  {
  	time_t t;
  
@@ -47,18 +48,19 @@ To use this patch, run these commands for a successful build:
  	if (t - last_io_in >= io_timeout) {
  		if (!am_server && !am_daemon) {
  			rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
---- old/options.c
-+++ new/options.c
-@@ -106,6 +106,7 @@ size_t bwlimit_writemax = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -113,6 +113,7 @@ size_t bwlimit_writemax = 0;
  int ignore_existing = 0;
  int ignore_non_existing = 0;
  int need_messages_from_generator = 0;
 +time_t stop_at_utime = 0;
- int max_delete = -1;
+ int max_delete = INT_MIN;
  OFF_T max_size = 0;
  OFF_T min_size = 0;
-@@ -374,6 +375,8 @@ void usage(enum logcode F)
-   rprintf(F,"     --password-file=FILE    read password from FILE\n");
+@@ -425,6 +426,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");
 +  rprintf(F,"     --stop-at=y-m-dTh:m     Stop rsync at year-month-dayThour:minute\n");
@@ -66,27 +68,27 @@ 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
+@@ -447,7 +450,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        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_ICONV,
++      OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_STOP_AT, OPT_TIME_LIMIT,
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -514,6 +517,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 },
+@@ -627,6 +630,8 @@ static struct poptOption long_options[] = {
+   {"no-timeout",       0,  POPT_ARG_VAL,    &io_timeout, 0, 0, 0 },
+   {"contimeout",       0,  POPT_ARG_INT,    &connect_timeout, 0, 0, 0 },
+   {"no-contimeout",    0,  POPT_ARG_VAL,    &connect_timeout, 0, 0, 0 },
 +  {"stop-at",          0,  POPT_ARG_STRING, 0, OPT_STOP_AT, 0, 0 },
 +  {"time-limit",       0,  POPT_ARG_STRING, 0, OPT_TIME_LIMIT, 0, 0 },
-   {"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 },
-@@ -1087,6 +1092,36 @@ int parse_arguments(int *argc, const cha
- 			usage(FINFO);
- 			exit_cleanup(0);
+   {"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 },
+@@ -1261,6 +1266,36 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+ 			return 0;
+ #endif
  
 +		case OPT_STOP_AT:
 +			arg = poptGetOptArg(pc);
@@ -121,7 +123,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. */
-@@ -1646,6 +1681,15 @@ void server_options(char **args,int *arg
+@@ -1913,6 +1948,15 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = arg;
  	}
  
@@ -137,10 +139,11 @@ To use this patch, run these commands for a successful build:
  	if (backup_dir) {
  		args[ac++] = "--backup-dir";
  		args[ac++] = backup_dir;
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -395,6 +395,8 @@ to the detailed description below for a 
-      --password-file=FILE    read password from FILE
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -422,6 +422,8 @@ to the detailed description below for a complete description.  verb(
+      --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
 +     --stop-at=y-m-dTh:m     Stop rsync at year-month-dayThour:minute
@@ -148,7 +151,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
-@@ -1746,6 +1748,19 @@ transfer was too fast, it will wait befo
+@@ -2029,6 +2031,19 @@ transfer was too fast, it will wait before sending the next data block. The
  result is an average transfer rate equaling the specified limit. A value
  of zero specifies no limit.
  
@@ -168,9 +171,10 @@ To use this patch, run these commands for a successful build:
  dit(bf(--write-batch=FILE)) Record a file that can later be applied to
  another identical destination with bf(--read-batch). See the "BATCH MODE"
  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 *
+diff --git a/util.c b/util.c
+--- a/util.c
++++ b/util.c
+@@ -123,6 +123,133 @@ NORETURN void overflow_exit(const char *str)
  	exit_cleanup(RERR_MALLOC);
  }