Updated to apply cleanly.

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

diff --git a/time-limit.diff b/time-limit.diff
index 3a0dfd9..5294ef3 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -41,7 +41,7 @@ Do we need configure support for mktime()?
                if (!am_server && !am_daemon) {
                        rprintf(FERROR, "io timeout after %d seconds - exiting\n",
                                (int)(t-last_io));
---- orig/options.c     2004-08-12 18:34:38
+--- 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;
@@ -77,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 },
-@@ -620,6 +626,36 @@ int parse_arguments(int *argc, const cha
+@@ -616,6 +622,36 @@ int parse_arguments(int *argc, const cha
                        return 0;
  #endif
  
@@ -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 (opt-BASE is its index). */
-@@ -995,6 +1031,15 @@ void server_options(char **args,int *arg
+@@ -1001,6 +1037,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      2004-08-13 07:18:59
+--- orig/rsync.yo      2004-09-20 05:10:48
 +++ rsync.yo   2004-07-15 02:44:40
 @@ -378,6 +378,8 @@ verb(
       --log-format=FORMAT     log file transfers using specified format
@@ -141,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
-@@ -972,6 +974,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.
  
@@ -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 --read-batch. See the "BATCH MODE"
  section for details.
---- orig/util.c        2004-08-13 07:18:59
+--- orig/util.c        2004-09-07 21:45:30
 +++ util.c     2004-07-03 20:23:22
 @@ -126,6 +126,132 @@ void overflow(char *str)
        exit_cleanup(RERR_MALLOC);