Fixed patch fuzz.

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

diff --git a/time-limit.diff b/time-limit.diff
index 86db63a..dfd2a68 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -3,9 +3,9 @@ to be simpler and more efficient by Wayne Davison.
 
 Do we need configure support for mktime()?
 
---- orig/io.c  2004-08-02 02:44:26
+--- orig/io.c  2004-11-25 16:32:40
 +++ io.c       2004-07-17 15:28:36
-@@ -49,6 +49,7 @@ extern int am_sender;
+@@ -50,6 +50,7 @@ extern int am_generator;
  extern int eol_nulls;
  extern int checksum_seed;
  extern int protocol_version;
@@ -13,7 +13,7 @@ Do we need configure support for mktime()?
  extern char *remote_filesfrom_file;
  extern struct stats stats;
  
-@@ -135,17 +136,22 @@ static void check_timeout(void)
+@@ -136,17 +137,22 @@ static void check_timeout(void)
  {
        time_t t;
  
@@ -41,9 +41,9 @@ 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-11 23:42:23
-+++ options.c  2004-07-15 17:06:09
-@@ -96,6 +96,7 @@ int blocking_io = -1;
+--- orig/options.c     2004-11-27 18:27:35
++++ options.c  2004-11-11 22:22:25
+@@ -98,6 +98,7 @@ int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
  unsigned int block_size = 0;
@@ -51,7 +51,7 @@ Do we need configure support for mktime()?
  
  
  /** Network address family. **/
-@@ -301,6 +302,8 @@ void usage(enum logcode F)
+@@ -305,6 +306,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");
@@ -59,27 +59,27 @@ Do we need configure support for mktime()?
 +  rprintf(F,"     --time-limit=MINS       Stop rsync after MINS minutes have elapsed\n");
    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");
-@@ -320,6 +323,7 @@ enum {OPT_VERSION = 1000, OPT_SENDER, OP
-       OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
+ #ifdef INET6
+@@ -323,6 +326,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+       OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
-       OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
+       OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
 +      OPT_STOP_AT, OPT_TIME_LIMIT,
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -394,6 +398,8 @@ static struct poptOption long_options[] 
-   {"port",             0,  POPT_ARG_INT,    &rsync_port, 0, 0, 0 },
+@@ -395,6 +399,8 @@ static struct poptOption long_options[] 
+   {0,                 'P', POPT_ARG_NONE,   0, 'P', 0, 0 },
    {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
 +  {"stop-at",          0,  POPT_ARG_STRING, 0, OPT_STOP_AT, 0, 0 },
 +  {"time-limit",       0,  POPT_ARG_STRING, 0, OPT_TIME_LIMIT, 0, 0 },
-   {"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
-                       return 0;
- #endif
+   {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
+@@ -749,6 +755,36 @@ int parse_arguments(int *argc, const cha
+                       basis_dir[basis_dir_cnt++] = (char *)arg;
+                       break;
  
 +              case OPT_STOP_AT:
 +                      arg = poptGetOptArg(pc);
@@ -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
+@@ -1140,6 +1176,15 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -130,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-08-11 17:26:27
+--- orig/rsync.yo      2004-11-27 17:53:24
 +++ rsync.yo   2004-07-15 02:44:40
-@@ -349,6 +349,8 @@ verb(
+@@ -375,6 +375,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
@@ -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
-@@ -943,6 +945,19 @@ transfer was too fast, it will wait befo
+@@ -987,6 +989,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-11 23:42:23
+--- 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);