Fixed fuzz and failed hunks.

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

diff --git a/time-limit.diff b/time-limit.diff
index f71e9f2..c065bc3 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       15 May 2004 19:31:10 -0000      1.121
-+++ io.c       22 May 2004 19:33:07 -0000
+--- io.c       6 Jun 2004 19:15:58 -0000       1.125
++++ io.c       6 Jun 2004 21:28:20 -0000
 @@ -44,6 +44,7 @@ static int io_multiplexing_in;
  static int multiplex_in_fd = -1;
  static int multiplex_out_fd = -1;
@@ -13,7 +13,7 @@ Do we need configure support for mktime()?
  static int no_flush;
  
  extern int bwlimit;
-@@ -125,16 +126,21 @@ static void check_timeout(void)
+@@ -128,16 +129,21 @@ static void check_timeout(void)
  {
        time_t t;
  
@@ -39,9 +39,9 @@ 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  22 May 2004 06:09:22 -0000      1.151
-+++ options.c  22 May 2004 19:33:07 -0000
-@@ -92,6 +92,7 @@ int modify_window = 0;
+--- options.c  6 Jun 2004 19:02:40 -0000       1.155
++++ options.c  6 Jun 2004 21:28:21 -0000
+@@ -95,6 +95,7 @@ int modify_window = 0;
  int blocking_io = -1;
  int checksum_seed = 0;
  unsigned int block_size = 0;
@@ -49,7 +49,7 @@ Do we need configure support for mktime()?
  
  
  /** Network address family. **/
-@@ -288,6 +289,8 @@ void usage(enum logcode F)
+@@ -292,6 +293,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,16 +58,15 @@ Do we need configure support for mktime()?
    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,"     --checksum-seed=NUM     set block/file checksum seed\n");
-@@ -306,7 +309,7 @@ void usage(enum logcode F)
- enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -311,6 +314,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_READ_BATCH, OPT_WRITE_BATCH, OPT_STOP_AT, OPT_TIME_LIMIT,
+       OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
++      OPT_STOP_AT, OPT_TIME_LIMIT,
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -378,6 +381,8 @@ static struct poptOption long_options[] 
+@@ -383,6 +387,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 },
@@ -76,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 },
-@@ -587,6 +592,36 @@ int parse_arguments(int *argc, const cha
+@@ -601,6 +607,36 @@ int parse_arguments(int *argc, const cha
                        return 0;
  #endif
  
@@ -113,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). */
-@@ -886,6 +921,15 @@ void server_options(char **args,int *arg
+@@ -908,6 +944,15 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -129,9 +128,9 @@ Do we need configure support for mktime()?
        if (backup_dir) {
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
---- rsync.yo   21 May 2004 09:44:32 -0000      1.170
-+++ rsync.yo   22 May 2004 19:33:08 -0000
-@@ -346,6 +346,8 @@ verb(
+--- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
++++ rsync.yo   6 Jun 2004 21:28:21 -0000
+@@ -347,6 +347,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
@@ -140,7 +139,7 @@ Do we need configure support for mktime()?
       --write-batch=PREFIX    write batch fileset starting with PREFIX
       --read-batch=PREFIX     read batch fileset starting with PREFIX
       --checksum-seed=NUM     set block/file checksum seed
-@@ -892,6 +894,19 @@ transfer was too fast, it will wait befo
+@@ -897,6 +899,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.
  
@@ -160,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     21 May 2004 08:40:25 -0000      1.144
-+++ util.c     22 May 2004 19:33:08 -0000
+--- util.c     5 Jun 2004 20:26:56 -0000       1.148
++++ util.c     6 Jun 2004 21:28:22 -0000
 @@ -125,6 +125,132 @@ void overflow(char *str)
        exit_cleanup(RERR_MALLOC);
  }