X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9a7eef964a2e3389ffd3537302f80ca42cfe9239..92796ae335c30ae51fc3aebd079a9f0246dae79d:/time-limit.diff

diff --git a/time-limit.diff b/time-limit.diff
index 467811a..55c7086 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;
+ extern struct file_list *cur_flist, *first_flist;
  
  const char phase_unknown[] = "unknown";
-@@ -168,16 +169,24 @@ static void check_timeout(void)
+@@ -172,16 +173,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
-@@ -115,6 +115,7 @@ int checksum_seed = 0;
- int inplace = 0;
- int delay_updates = 0;
- long block_size = 0; /* "long" because popt can't set an int32. */
+@@ -108,6 +108,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. **/
-@@ -363,6 +364,8 @@ void usage(enum logcode F)
-   rprintf(F,"     --password-file=FILE    read password from FILE\n");
+ int max_delete = -1;
+ OFF_T max_size = 0;
+ OFF_T min_size = 0;
+@@ -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");
 +  rprintf(F,"     --stop-at=y-m-dTh:m     Stop rsync at year-month-dayThour:minute\n");
@@ -60,7 +66,7 @@ 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");
-@@ -383,7 +386,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,
@@ -69,8 +75,8 @@ Do we need configure support for mktime()?
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -492,6 +495,8 @@ static struct poptOption long_options[] 
-   {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
+@@ -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 },
 +  {"stop-at",          0,  POPT_ARG_STRING, 0, OPT_STOP_AT, 0, 0 },
@@ -78,9 +84,9 @@ Do we need configure support for mktime()?
    {"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 },
-@@ -1057,6 +1062,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);
@@ -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. */
-@@ -1608,6 +1643,15 @@ void server_options(char **args,int *arg
+@@ -1715,6 +1750,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
-@@ -387,6 +387,8 @@ to the detailed description below for a 
-      --password-file=FILE    read password from FILE
+@@ -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
 +     --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
-@@ -1572,6 +1574,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.
  
@@ -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
-@@ -128,6 +128,132 @@ void overflow_exit(char *str)
+@@ -120,6 +120,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;
@@ -294,6 +300,7 @@ 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