Updated to apply cleanly.

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

diff --git a/time-limit.diff b/time-limit.diff
index 105ba4f..3e434b4 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -3,8 +3,8 @@ to be simpler and more efficient by Wayne Davison.
 
 Do we need configure support for mktime() and strptime()?
 
---- io.c       16 Jan 2004 16:31:47 -0000      1.119
-+++ io.c       27 Apr 2004 02:56:33 -0000
+--- io.c       8 May 2004 18:03:43 -0000       1.120
++++ io.c       8 May 2004 18:42:14 -0000
 @@ -44,6 +44,7 @@ static int io_multiplexing_in;
  static int multiplex_in_fd = -1;
  static int multiplex_out_fd = -1;
@@ -38,8 +38,8 @@ Do we need configure support for mktime() and strptime()?
  
        if (last_io && io_timeout && (t-last_io) >= io_timeout) {
                if (!am_server && !am_daemon) {
---- options.c  17 Apr 2004 17:07:23 -0000      1.147
-+++ options.c  27 Apr 2004 02:56:33 -0000
+--- options.c  6 May 2004 21:08:01 -0000       1.148
++++ options.c  8 May 2004 18:42:14 -0000
 @@ -92,6 +92,7 @@ int modify_window = 0;
  int blocking_io = -1;
  int checksum_seed = 0;
@@ -56,7 +56,7 @@ Do we need configure support for mktime() and strptime()?
 +  rprintf(F,"     --time-limit=TIME       Stop rsync after TIME minutes have elapsed\n");
    rprintf(F,"     --write-batch=PREFIX    write batch fileset starting with PREFIX\n");
    rprintf(F,"     --read-batch=PREFIX     read batch fileset starting with PREFIX\n");
-   rprintf(F," -h, --help                  show this help screen\n");
+ #ifdef INET6
 @@ -305,7 +308,7 @@ void usage(enum logcode F)
  enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
@@ -137,8 +137,8 @@ Do we need configure support for mktime() and strptime()?
                        goto oom;
                args[ac++] = arg;
        }
---- rsync.yo   24 Apr 2004 06:16:04 -0000      1.164
-+++ rsync.yo   27 Apr 2004 02:56:35 -0000
+--- rsync.yo   7 May 2004 00:18:37 -0000       1.169
++++ rsync.yo   8 May 2004 18:42:15 -0000
 @@ -346,6 +346,8 @@ verb(
       --log-format=FORMAT     log file transfers using specified format
       --password-file=FILE    get password from FILE
@@ -147,8 +147,8 @@ Do we need configure support for mktime() and strptime()?
 +     --time-limit=TIME       Stop rsync after TIME minutes have elapsed
       --write-batch=PREFIX    write batch fileset starting with PREFIX
       --read-batch=PREFIX     read batch fileset starting with PREFIX
-  -h, --help                  show this help screen
-@@ -888,6 +890,13 @@ of rsync transfers, blocks of data are s
+  -4  --ipv4                  prefer IPv4
+@@ -890,6 +892,13 @@ of rsync transfers, blocks of data are s
  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.