Got rid of patch fuzz.

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

diff --git a/time-limit.diff b/time-limit.diff
index 9cc1469..a02ece7 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -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     2005-01-24 00:18:21
+--- orig/options.c     2005-01-25 03:26:51
 +++ options.c  2005-01-01 21:19:56
-@@ -100,6 +100,7 @@ int blocking_io = -1;
+@@ -102,6 +102,7 @@ int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
  long block_size = 0; /* "long" because popt can't set an int32. */
@@ -51,7 +51,7 @@ Do we need configure support for mktime()?
  
  
  /** Network address family. **/
-@@ -310,6 +311,8 @@ void usage(enum logcode F)
+@@ -319,6 +320,8 @@ void usage(enum logcode F)
    rprintf(F,"     --password-file=FILE    get password from FILE\n");
    rprintf(F,"     --list-only             list the files instead of copying them\n");
    rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth, KBytes per second\n");
@@ -60,15 +60,15 @@ 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");
  #ifdef INET6
-@@ -327,6 +330,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
-       OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
+@@ -336,6 +339,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+       OPT_FILTER, 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_MAX_SIZE,
 +      OPT_STOP_AT, OPT_TIME_LIMIT,
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -402,6 +406,8 @@ static struct poptOption long_options[] 
+@@ -415,6 +419,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 },
@@ -77,7 +77,7 @@ Do we need configure support for mktime()?
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
    {"hard-links",      'H', POPT_ARG_NONE,   &preserve_hard_links, 0, 0, 0 },
    {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
-@@ -747,6 +753,36 @@ int parse_arguments(int *argc, const cha
+@@ -788,6 +794,36 @@ int parse_arguments(int *argc, const cha
                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  
@@ -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). */
-@@ -1144,6 +1180,15 @@ void server_options(char **args,int *arg
+@@ -1192,6 +1228,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      2005-01-24 00:18:21
+--- orig/rsync.yo      2005-01-25 03:26:51
 +++ rsync.yo   2004-07-15 02:44:40
-@@ -378,6 +378,8 @@ verb(
+@@ -384,6 +384,8 @@ verb(
       --password-file=FILE    get password from FILE
       --list-only             list the files instead of copying them
       --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
-@@ -1040,6 +1042,19 @@ transfer was too fast, it will wait befo
+@@ -1090,6 +1092,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.