Updated to apply cleanly.

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

diff --git a/time-limit.diff b/time-limit.diff
index c065bc3..d8e8897 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()?
 
---- io.c       6 Jun 2004 19:15:58 -0000       1.125
-+++ io.c       6 Jun 2004 21:28:20 -0000
+--- io.c       9 Jun 2004 03:07:50 -0000       1.129
++++ io.c       18 Jun 2004 17:38:20 -0000
 @@ -44,6 +44,7 @@ static int io_multiplexing_in;
  static int multiplex_in_fd = -1;
  static int multiplex_out_fd = -1;
@@ -39,8 +39,8 @@ Do we need configure support for mktime()?
        if (last_io && io_timeout && (t-last_io) >= io_timeout) {
                if (!am_server && !am_daemon) {
                        rprintf(FERROR, "io timeout after %d seconds - exiting\n",
---- options.c  6 Jun 2004 19:02:40 -0000       1.155
-+++ options.c  6 Jun 2004 21:28:21 -0000
+--- options.c  7 Jun 2004 22:05:22 -0000       1.156
++++ options.c  18 Jun 2004 17:38:21 -0000
 @@ -95,6 +95,7 @@ int modify_window = 0;
  int blocking_io = -1;
  int checksum_seed = 0;
@@ -75,7 +75,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
+@@ -596,6 +602,36 @@ int parse_arguments(int *argc, const cha
                        return 0;
  #endif
  
@@ -112,7 +112,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). */
-@@ -908,6 +944,15 @@ void server_options(char **args,int *arg
+@@ -903,6 +939,15 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -129,7 +129,7 @@ Do we need configure support for mktime()?
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
-+++ rsync.yo   6 Jun 2004 21:28:21 -0000
++++ rsync.yo   18 Jun 2004 17:38:21 -0000
 @@ -347,6 +347,8 @@ verb(
       --log-format=FORMAT     log file transfers using specified format
       --password-file=FILE    get password from FILE
@@ -159,8 +159,8 @@ Do we need configure support for mktime()?
  dit(bf(--write-batch=PREFIX)) Generate a set of files that can be
  transferred as a batch update. Each filename in the set starts with
  PREFIX. See the "BATCH MODE" section for details.
---- util.c     5 Jun 2004 20:26:56 -0000       1.148
-+++ util.c     6 Jun 2004 21:28:22 -0000
+--- util.c     9 Jun 2004 21:51:07 -0000       1.149
++++ util.c     18 Jun 2004 17:38:22 -0000
 @@ -125,6 +125,132 @@ void overflow(char *str)
        exit_cleanup(RERR_MALLOC);
  }