X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/afcb578c53a1c5579d48336e2197e476cead7057..7e420a3e115be238399b5ec1e87f60e20368fa9f:/time-limit.diff

diff --git a/time-limit.diff b/time-limit.diff
index 7478534..10acf14 100644
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -3,17 +3,23 @@ to be simpler and more efficient by Wayne Davison.
 
 Do we need configure support for mktime()?
 
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/time-limit.diff
+    ./configure                              (optional if already run)
+    make
+
 --- old/io.c
 +++ new/io.c
-@@ -57,6 +57,7 @@ extern int remove_sent_files;
+@@ -52,6 +52,7 @@ 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";
-@@ -168,16 +169,24 @@ static void check_timeout(void)
+ extern struct file_list *cur_flist, *first_flist;
+ #ifdef ICONV_OPTION
+ extern iconv_t ic_send, ic_recv;
+@@ -179,16 +180,24 @@ static void check_timeout(void)
  {
  	time_t t;
  
@@ -43,16 +49,16 @@ Do we need configure support for mktime()?
  			rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
 --- old/options.c
 +++ new/options.c
-@@ -116,6 +116,7 @@ int checksum_seed = 0;
- int inplace = 0;
- int delay_updates = 0;
- long block_size = 0; /* "long" because popt can't set an int32. */
+@@ -109,6 +109,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;
- 
- 
- /** Network address family. **/
-@@ -365,6 +366,8 @@ void usage(enum logcode F)
-   rprintf(F,"     --password-file=FILE    read password from FILE\n");
+ int max_delete = INT_MIN;
+ OFF_T max_size = 0;
+ OFF_T min_size = 0;
+@@ -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");
 +  rprintf(F,"     --stop-at=y-m-dTh:m     Stop rsync at year-month-dayThour:minute\n");
@@ -60,27 +66,27 @@ Do we need configure support for mktime()?
    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");
-@@ -385,7 +388,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[] = {
-@@ -494,6 +497,8 @@ static struct poptOption long_options[] 
-   {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
-   {"itemize-changes", 'i', POPT_ARG_NONE,   0, 'i', 0, 0 },
-   {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
+@@ -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 },
 +  {"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 },
-@@ -1060,6 +1065,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 },
+@@ -1205,6 +1210,36 @@ int parse_arguments(int *argc, const cha
+ 			return 0;
+ #endif
  
 +		case OPT_STOP_AT:
 +			arg = poptGetOptArg(pc);
@@ -115,7 +121,7 @@ Do we need configure support for mktime()?
  		default:
  			/* A large opt value means that set_refuse_options()
  			 * turned this option off. */
-@@ -1610,6 +1645,15 @@ void server_options(char **args,int *arg
+@@ -1803,6 +1838,15 @@ void server_options(char **args,int *arg
  		args[ac++] = arg;
  	}
  
@@ -133,8 +139,8 @@ Do we need configure support for mktime()?
  		args[ac++] = backup_dir;
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -388,6 +388,8 @@ to the detailed description below for a 
-      --password-file=FILE    read password from FILE
+@@ -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
 +     --stop-at=y-m-dTh:m     Stop rsync at year-month-dayThour:minute
@@ -142,7 +148,7 @@ Do we need configure support for mktime()?
       --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
-@@ -1584,6 +1586,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.
  
@@ -164,7 +170,7 @@ Do we need configure support for mktime()?
  section for details, and also the bf(--only-write-batch) option.
 --- old/util.c
 +++ new/util.c
-@@ -125,6 +125,133 @@ void overflow_exit(char *str)
+@@ -121,6 +121,133 @@ NORETURN void overflow_exit(const char *
  	exit_cleanup(RERR_MALLOC);
  }
  
@@ -192,13 +198,13 @@ Do we need configure support for mktime()?
 +	} else
 +		in_date = 1;
 +	for ( ; ; cp++) {
-+		if (!isdigit(*cp))
++		if (!isDigit(cp))
 +			return -1;
 +
 +		n = 0;
 +		do {
 +			n = n * 10 + *cp++ - '0';
-+		} while (isdigit(*cp));
++		} while (isDigit(cp));
 +
 +		if (*cp == ':')
 +			in_date = 0;
@@ -295,6 +301,6 @@ Do we need configure support for mktime()?
 +	return val;
 +}
 +
- int set_modtime(char *fname, time_t modtime, mode_t mode)
+ int set_modtime(const char *fname, time_t modtime, mode_t mode)
  {
  #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES