Tweaked a directory copy command in default-acls.test.

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

diff --git a/time-limit.diff b/time-limit.diff
index b127772..7478534 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -3,8 +3,8 @@ to be simpler and more efficient by Wayne Davison.
 
 Do we need configure support for mktime()?
 
---- orig/io.c  2005-12-08 21:19:31
-+++ io.c       2005-05-19 09:01:27
+--- old/io.c
++++ new/io.c
 @@ -57,6 +57,7 @@ extern int remove_sent_files;
  extern int preserve_hard_links;
  extern char *filesfrom_host;
@@ -41,9 +41,9 @@ 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     2006-01-31 03:11:30
-+++ options.c  2006-01-26 10:58:41
-@@ -115,6 +115,7 @@ int checksum_seed = 0;
+--- old/options.c
++++ new/options.c
+@@ -116,6 +116,7 @@ int checksum_seed = 0;
  int inplace = 0;
  int delay_updates = 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. **/
-@@ -363,6 +364,8 @@ void usage(enum logcode F)
+@@ -365,6 +366,8 @@ void usage(enum logcode F)
    rprintf(F,"     --password-file=FILE    read 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,7 +60,7 @@ Do we need configure support for mktime()?
    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");
-@@ -383,7 +386,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP
+@@ -385,7 +388,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,
@@ -69,7 +69,7 @@ Do we need configure support for mktime()?
        OPT_SERVER, OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -492,6 +495,8 @@ static struct poptOption long_options[] 
+@@ -494,6 +497,8 @@ static struct poptOption long_options[] 
    {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
    {"itemize-changes", 'i', POPT_ARG_NONE,   0, 'i', 0, 0 },
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
@@ -78,7 +78,7 @@ Do we need configure support for mktime()?
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
    {"backup-dir",       0,  POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
    {"suffix",           0,  POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-@@ -1057,6 +1062,36 @@ int parse_arguments(int *argc, const cha
+@@ -1060,6 +1065,36 @@ int parse_arguments(int *argc, const cha
                        usage(FINFO);
                        exit_cleanup(0);
  
@@ -115,7 +115,7 @@ Do we need configure support for mktime()?
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1608,6 +1643,15 @@ void server_options(char **args,int *arg
+@@ -1610,6 +1645,15 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -131,9 +131,9 @@ Do we need configure support for mktime()?
        if (backup_dir) {
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
---- orig/rsync.yo      2006-01-31 03:05:44
-+++ rsync.yo   2005-02-01 10:46:35
-@@ -387,6 +387,8 @@ to the detailed description below for a 
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -388,6 +388,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
@@ -142,7 +142,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
-@@ -1534,6 +1536,19 @@ transfer was too fast, it will wait befo
+@@ -1584,6 +1586,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.
  
@@ -162,9 +162,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        2006-01-30 07:18:28
-+++ util.c     2004-07-03 20:23:22
-@@ -128,6 +128,132 @@ void overflow_exit(char *str)
+--- old/util.c
++++ new/util.c
+@@ -125,6 +125,133 @@ void overflow_exit(char *str)
        exit_cleanup(RERR_MALLOC);
  }
  
@@ -294,6 +294,7 @@ Do we need configure support for mktime()?
 +      }
 +      return val;
 +}
- 
- 
++
  int set_modtime(char *fname, time_t modtime, mode_t mode)
+ {
+ #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES