Fixed failing hunks.

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

diff --git a/time-limit.diff b/time-limit.diff
index ff07273..cb110c9 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -3,7 +3,7 @@ to be simpler and more efficient by Wayne Davison.
 
 Do we need configure support for mktime()?
 
---- orig/io.c  2005-05-19 08:52:42
+--- orig/io.c  2005-08-17 06:45:07
 +++ io.c       2005-05-19 09:01:27
 @@ -57,6 +57,7 @@ extern int remove_sent_files;
  extern int preserve_hard_links;
@@ -41,8 +41,8 @@ Do we need configure support for mktime()?
        if (t - last_io_in >= io_timeout) {
                if (!am_server && !am_daemon) {
                        rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
---- orig/options.c     2005-05-19 08:52:42
-+++ options.c  2005-05-19 09:01:55
+--- orig/options.c     2005-08-27 21:11:26
++++ options.c  2005-08-27 21:27:57
 @@ -106,6 +106,7 @@ int checksum_seed = 0;
  int inplace = 0;
  int delay_updates = 0;
@@ -68,16 +68,16 @@ Do we need configure support for mktime()?
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -450,6 +454,8 @@ static struct poptOption long_options[] 
+@@ -458,6 +462,8 @@ static struct poptOption long_options[] 
    {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
    {"itemize-changes", 'i', POPT_ARG_NONE,   &itemize_changes, 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 },
+   {"backup",          'b', POPT_ARG_NONE,   &make_backups, 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 },
-   {"read-batch",       0,  POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
-@@ -876,6 +882,36 @@ int parse_arguments(int *argc, const cha
+   {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
+@@ -916,6 +922,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. */
-@@ -1365,6 +1401,15 @@ void server_options(char **args,int *arg
+@@ -1412,6 +1448,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-05-22 20:53:34
+--- orig/rsync.yo      2005-08-27 21:05:12
 +++ rsync.yo   2005-02-01 10:46:35
-@@ -379,6 +379,8 @@ to the detailed description below for a 
+@@ -378,6 +378,8 @@ to the detailed description below for a 
       --password-file=FILE    read 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 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
-@@ -1283,6 +1285,19 @@ transfer was too fast, it will wait befo
+@@ -1320,6 +1322,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,9 +161,9 @@ 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 bf(--read-batch). See the "BATCH MODE"
  section for details, and also the bf(--only-write-batch) option.
---- orig/util.c        2005-05-03 16:47:33
+--- orig/util.c        2005-08-17 06:45:08
 +++ util.c     2004-07-03 20:23:22
-@@ -126,6 +126,132 @@ void overflow(char *str)
+@@ -126,6 +126,132 @@ void overflow_exit(char *str)
        exit_cleanup(RERR_MALLOC);
  }
  
@@ -295,4 +295,4 @@ Do we need configure support for mktime()?
 +}
  
  
- int set_modtime(char *fname, time_t modtime)
+ int set_modtime(char *fname, time_t modtime, mode_t mode)