Updated.

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

diff --git a/time-limit.diff b/time-limit.diff
index f60d9f2..1556a06 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -39,17 +39,17 @@ 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",
---- orig/options.c     2004-07-15 16:51:50
+--- orig/options.c     2004-07-16 20:07:22
 +++ options.c  2004-07-15 17:06:09
-@@ -95,6 +95,7 @@ int modify_window = 0;
- int blocking_io = -1;
+@@ -96,6 +96,7 @@ int blocking_io = -1;
  int checksum_seed = 0;
+ int inplace = 0;
  unsigned int block_size = 0;
 +time_t stop_at_utime = 0;
  
  
  /** Network address family. **/
-@@ -291,6 +292,8 @@ void usage(enum logcode F)
+@@ -298,6 +299,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,7 +58,7 @@ Do we need configure support for mktime()?
    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");
-@@ -310,6 +313,7 @@ enum {OPT_VERSION = 1000, OPT_SENDER, OP
+@@ -317,6 +320,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_TIMEOUT,
@@ -66,7 +66,7 @@ Do we need configure support for mktime()?
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -382,6 +386,8 @@ static struct poptOption long_options[] 
+@@ -390,6 +394,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 },
@@ -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 },
-@@ -593,6 +599,36 @@ int parse_arguments(int *argc, const cha
+@@ -601,6 +607,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). */
-@@ -895,6 +931,15 @@ void server_options(char **args,int *arg
+@@ -930,6 +966,15 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -128,9 +128,9 @@ Do we need configure support for mktime()?
        if (backup_dir) {
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
---- orig/rsync.yo      2004-07-15 02:21:11
+--- orig/rsync.yo      2004-07-16 20:07:23
 +++ rsync.yo   2004-07-15 02:44:40
-@@ -347,6 +347,8 @@ verb(
+@@ -348,6 +348,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
@@ -139,7 +139,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
-@@ -897,6 +899,19 @@ transfer was too fast, it will wait befo
+@@ -909,6 +911,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.