Applied to trunk.

[rsync/rsync-patches.git] / time-limit.diff

diff --git a/time-limit.diff b/time-limit.diff
index 427ba70..6e1c414 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -3,17 +3,17 @@ to be simpler and more efficient by Wayne Davison.
 
 Do we need configure support for mktime()?
 
---- orig/io.c  2005-03-01 03:11:36
-+++ io.c       2005-03-01 03:12:23
-@@ -51,6 +51,7 @@ extern int eol_nulls;
- extern int csum_length;
- extern int checksum_seed;
- extern int protocol_version;
-+extern time_t stop_at_utime;
+--- orig/io.c  2005-03-09 18:54:02
++++ io.c       2005-03-05 00:32:06
+@@ -56,6 +56,7 @@ extern int remove_sent_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;
  
-@@ -137,16 +138,24 @@ static void check_timeout(void)
+ const char phase_unknown[] = "unknown";
+@@ -163,16 +164,24 @@ static void check_timeout(void)
  {
        time_t t;
  
@@ -41,7 +41,7 @@ Do we need configure support for mktime()?
        if (t - last_io >= io_timeout) {
                if (!am_server && !am_daemon) {
                        rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
---- orig/options.c     2005-03-01 05:49:24
+--- orig/options.c     2005-03-31 00:24:21
 +++ options.c  2005-01-28 19:35:23
 @@ -105,6 +105,7 @@ int checksum_seed = 0;
  int inplace = 0;
@@ -51,7 +51,7 @@ Do we need configure support for mktime()?
  
  
  /** Network address family. **/
-@@ -341,6 +342,8 @@ void usage(enum logcode F)
+@@ -343,6 +344,8 @@ void usage(enum logcode F)
    rprintf(F,"     --password-file=FILE    read 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");
@@ -59,16 +59,16 @@ Do we need configure support for mktime()?
 +  rprintf(F,"     --time-limit=MINS       Stop rsync after MINS minutes have elapsed\n");
    rprintf(F,"     --write-batch=FILE      write a batched update to FILE\n");
    rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
- #ifdef INET6
-@@ -358,6 +361,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
-       OPT_FILTER, OPT_COMPARE_DEST, OPT_LINK_DEST,
+   rprintf(F,"     --protocol=NUM          force an older protocol version to be used\n");
+@@ -361,6 +364,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+       OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
 +      OPT_STOP_AT, OPT_TIME_LIMIT,
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -442,6 +446,8 @@ static struct poptOption long_options[] 
+@@ -446,6 +450,8 @@ static struct poptOption long_options[] 
    {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
    {"itemize-changes", 'i', POPT_ARG_NONE,   &itemize_changes, 0, 0, 0 },
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
@@ -77,7 +77,7 @@ Do we need configure support for mktime()?
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
    {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },
    {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
-@@ -854,6 +860,36 @@ int parse_arguments(int *argc, const cha
+@@ -863,6 +869,36 @@ int parse_arguments(int *argc, const cha
                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  
@@ -114,7 +114,7 @@ Do we need configure support for mktime()?
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1344,6 +1380,15 @@ void server_options(char **args,int *arg
+@@ -1347,6 +1383,15 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -130,7 +130,7 @@ Do we need configure support for mktime()?
        if (backup_dir) {
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
---- orig/rsync.yo      2005-03-01 01:22:59
+--- orig/rsync.yo      2005-03-30 16:57:29
 +++ rsync.yo   2005-02-01 10:46:35
 @@ -378,6 +378,8 @@ to the detailed description below for a 
       --password-file=FILE    read password from FILE
@@ -140,8 +140,8 @@ Do we need configure support for mktime()?
 +     --time-limit=MINS       Stop rsync after MINS minutes have elapsed
       --write-batch=FILE      write a batched update to FILE
       --read-batch=FILE       read a batched update from FILE
-      --checksum-seed=NUM     set block/file checksum seed (advanced)
-@@ -1225,6 +1227,19 @@ transfer was too fast, it will wait befo
+      --protocol=NUM          force an older protocol version to be used
+@@ -1267,6 +1269,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.
  
@@ -161,7 +161,7 @@ Do we need configure support for mktime()?
  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.
---- orig/util.c        2005-02-23 02:57:27
+--- orig/util.c        2005-03-30 20:45:02
 +++ util.c     2004-07-03 20:23:22
 @@ -126,6 +126,132 @@ void overflow(char *str)
        exit_cleanup(RERR_MALLOC);