Fixed failing hunks.

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

diff --git a/time-limit.diff b/time-limit.diff
index 10acf14..81c1e2d 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -11,15 +11,15 @@ To use this patch, run these commands for a successful build:
 
 --- old/io.c
 +++ new/io.c
-@@ -52,6 +52,7 @@ extern int remove_source_files;
+@@ -53,6 +53,7 @@ extern int protocol_version;
+ extern int remove_source_files;
  extern int preserve_hard_links;
- extern char *filesfrom_host;
  extern struct stats stats;
 +extern time_t stop_at_utime;
- extern struct file_list *cur_flist, *first_flist;
+ extern struct file_list *cur_flist;
  #ifdef ICONV_OPTION
- extern iconv_t ic_send, ic_recv;
-@@ -179,16 +180,24 @@ static void check_timeout(void)
+ extern int filesfrom_convert;
+@@ -215,16 +216,24 @@ static void check_timeout(void)
  {
        time_t t;
  
@@ -49,7 +49,7 @@ To use this patch, run these commands for a successful build:
                        rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
 --- old/options.c
 +++ new/options.c
-@@ -109,6 +109,7 @@ size_t bwlimit_writemax = 0;
+@@ -110,6 +110,7 @@ size_t bwlimit_writemax = 0;
  int ignore_existing = 0;
  int ignore_non_existing = 0;
  int need_messages_from_generator = 0;
@@ -57,7 +57,7 @@ To use this patch, run these commands for a successful build:
  int max_delete = INT_MIN;
  OFF_T max_size = 0;
  OFF_T min_size = 0;
-@@ -413,6 +414,8 @@ void usage(enum logcode F)
+@@ -416,6 +417,8 @@ void usage(enum logcode F)
    rprintf(F,"     --password-file=FILE    read daemon-access 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");
@@ -66,7 +66,7 @@ To use this patch, run these commands for a successful build:
    rprintf(F,"     --write-batch=FILE      write a batched update to FILE\n");
    rprintf(F,"     --only-write-batch=FILE like --write-batch but w/o updating destination\n");
    rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
-@@ -435,7 +438,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -438,7 +441,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_CHMOD,
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
@@ -75,7 +75,7 @@ To use this patch, run these commands for a successful build:
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -593,6 +596,8 @@ static struct poptOption long_options[] 
+@@ -603,6 +606,8 @@ static struct poptOption long_options[] 
    {"no-numeric-ids",   0,  POPT_ARG_VAL,    &numeric_ids, 0, 0, 0 },
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
    {"no-timeout",       0,  POPT_ARG_VAL,    &io_timeout, 0, 0, 0 },
@@ -84,7 +84,7 @@ To use this patch, run these commands for a successful build:
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
    {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
-@@ -1205,6 +1210,36 @@ int parse_arguments(int *argc, const cha
+@@ -1221,6 +1226,36 @@ int parse_arguments(int *argc_p, const c
                        return 0;
  #endif
  
@@ -121,7 +121,7 @@ To use this patch, run these commands for a successful build:
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1803,6 +1838,15 @@ void server_options(char **args,int *arg
+@@ -1841,6 +1876,15 @@ void server_options(char **args, int *ar
                args[ac++] = arg;
        }
  
@@ -139,7 +139,7 @@ To use this patch, run these commands for a successful build:
                args[ac++] = backup_dir;
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -421,6 +421,8 @@ to the detailed description below for a 
+@@ -422,6 +422,8 @@ to the detailed description below for a 
       --password-file=FILE    read daemon-access password from FILE
       --list-only             list the files instead of copying them
       --bwlimit=KBPS          limit I/O bandwidth; KBytes per second
@@ -148,7 +148,7 @@ To use this patch, run these commands for a successful build:
       --write-batch=FILE      write a batched update to FILE
       --only-write-batch=FILE like --write-batch but w/o updating dest
       --read-batch=FILE       read a batched update from FILE
-@@ -1902,6 +1904,19 @@ transfer was too fast, it will wait befo
+@@ -1933,6 +1935,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.
  
@@ -170,7 +170,7 @@ To use this patch, run these commands for a successful build:
  section for details, and also the bf(--only-write-batch) option.
 --- old/util.c
 +++ new/util.c
-@@ -121,6 +121,133 @@ NORETURN void overflow_exit(const char *
+@@ -122,6 +122,133 @@ NORETURN void overflow_exit(const char *
        exit_cleanup(RERR_MALLOC);
  }