Updated to apply cleanly.

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

diff --git a/time-limit.diff b/time-limit.diff
index 1556a06fba9fe51e7020d509ed27adad97734b97..5294ef395052598c9dc3d3c033ca607e8155217c 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  2004-07-15 02:21:10
-+++ io.c       2004-07-03 20:23:22
-@@ -44,6 +44,7 @@ static int io_multiplexing_in;
- static int multiplex_in_fd = -1;
- static int multiplex_out_fd = -1;
- static time_t last_io;
+--- orig/io.c  2004-08-02 02:44:26
++++ io.c       2004-07-17 15:28:36
+@@ -49,6 +49,7 @@ extern int am_sender;
+ extern int eol_nulls;
+ extern int checksum_seed;
+ extern int protocol_version;
 +extern time_t stop_at_utime;
- static int no_flush;
+ extern char *remote_filesfrom_file;
+ extern struct stats stats;
  
- extern int bwlimit;
-@@ -134,16 +135,21 @@ static void check_timeout(void)
+@@ -135,17 +136,22 @@ static void check_timeout(void)
  {
        time_t t;
  
@@ -36,10 +36,12 @@ Do we need configure support for mktime()?
  
 -      t = time(NULL);
 -
-       if (last_io && io_timeout && (t-last_io) >= io_timeout) {
+-      if (t - last_io >= io_timeout) {
++      if (io_timeout && t - last_io >= io_timeout) {
                if (!am_server && !am_daemon) {
                        rprintf(FERROR, "io timeout after %d seconds - exiting\n",
---- orig/options.c     2004-07-16 20:07:22
+                               (int)(t-last_io));
+--- orig/options.c     2004-09-20 05:10:48
 +++ options.c  2004-07-15 17:06:09
 @@ -96,6 +96,7 @@ int blocking_io = -1;
  int checksum_seed = 0;
@@ -49,7 +51,7 @@ Do we need configure support for mktime()?
  
  
  /** Network address family. **/
-@@ -298,6 +299,8 @@ void usage(enum logcode F)
+@@ -301,6 +302,8 @@ void usage(enum logcode F)
    rprintf(F,"     --log-format=FORMAT     log file transfers using specified format\n");
    rprintf(F,"     --password-file=FILE    get password from FILE\n");
    rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth, KBytes per second\n");
@@ -58,7 +60,7 @@ Do we need configure support for mktime()?
    rprintf(F,"     --write-batch=FILE      write a batch to FILE\n");
    rprintf(F,"     --read-batch=FILE       read a batch from FILE\n");
    rprintf(F,"     --checksum-seed=NUM     set block/file checksum seed\n");
-@@ -317,6 +320,7 @@ enum {OPT_VERSION = 1000, OPT_SENDER, OP
+@@ -320,6 +323,7 @@ enum {OPT_VERSION = 1000, OPT_SENDER, OP
        OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
@@ -66,7 +68,7 @@ Do we need configure support for mktime()?
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -390,6 +394,8 @@ static struct poptOption long_options[] 
+@@ -394,6 +398,8 @@ static struct poptOption long_options[] 
    {"port",             0,  POPT_ARG_INT,    &rsync_port, 0, 0, 0 },
    {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
@@ -75,7 +77,7 @@ Do we need configure support for mktime()?
    {"address",          0,  POPT_ARG_STRING, &bind_address, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
    {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },
-@@ -601,6 +607,36 @@ int parse_arguments(int *argc, const cha
+@@ -616,6 +622,36 @@ int parse_arguments(int *argc, const cha
                        return 0;
  #endif
  
@@ -112,7 +114,7 @@ Do we need configure support for mktime()?
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off (opt-BASE is its index). */
-@@ -930,6 +966,15 @@ void server_options(char **args,int *arg
+@@ -1001,6 +1037,15 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -128,9 +130,9 @@ Do we need configure support for mktime()?
        if (backup_dir) {
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
---- orig/rsync.yo      2004-07-16 20:07:23
+--- orig/rsync.yo      2004-09-20 05:10:48
 +++ rsync.yo   2004-07-15 02:44:40
-@@ -348,6 +348,8 @@ verb(
+@@ -378,6 +378,8 @@ verb(
       --log-format=FORMAT     log file transfers using specified format
       --password-file=FILE    get password from FILE
       --bwlimit=KBPS          limit I/O bandwidth, KBytes per second
@@ -139,7 +141,7 @@ Do we need configure support for mktime()?
       --write-batch=FILE      write a batch to FILE 
       --read-batch=FILE       read a batch from FILE
       --checksum-seed=NUM     set block/file checksum seed
-@@ -909,6 +911,19 @@ transfer was too fast, it will wait befo
+@@ -989,6 +991,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.
  
@@ -157,11 +159,11 @@ Do we need configure support for mktime()?
 +number of minutes rsync will run for.
 +
  dit(bf(--write-batch=FILE)) Record a file that can later be applied to
- anonther identical destination with --read-batch. See the "BATCH MODE"
+ another identical destination with --read-batch. See the "BATCH MODE"
  section for details.
---- orig/util.c        2004-06-09 21:54:47
+--- orig/util.c        2004-09-07 21:45:30
 +++ util.c     2004-07-03 20:23:22
-@@ -125,6 +125,132 @@ void overflow(char *str)
+@@ -126,6 +126,132 @@ void overflow(char *str)
        exit_cleanup(RERR_MALLOC);
  }