Updated to apply cleanly.

[rsync/rsync-patches.git] / max-size.diff

diff --git a/max-size.diff b/max-size.diff
index c2f52ee..7439e53 100644 (file)
--- a/max-size.diff
+++ b/max-size.diff
@@ -1,4 +1,4 @@
---- orig/generator.c   2004-07-29 16:08:03
+--- orig/generator.c   2004-08-05 18:24:21
 +++ generator.c        2004-07-03 20:20:46
 @@ -39,6 +39,7 @@ extern int opt_ignore_existing;
  extern int csum_length;
@@ -8,7 +8,7 @@
  extern int io_timeout;
  extern int protocol_version;
  extern int always_checksum;
-@@ -337,6 +338,10 @@ static void recv_generator(char *fname, 
+@@ -333,6 +334,10 @@ static void recv_generator(char *fname, 
                    && verbose && f_out != -1)
                        rprintf(FINFO, "%s/\n", safe_fname(fname));
                return;
@@ -19,7 +19,7 @@
        }
  
        if (preserve_links && S_ISLNK(file->mode)) {
---- orig/options.c     2004-07-29 16:08:03
+--- orig/options.c     2004-08-11 23:42:23
 +++ options.c  2004-07-15 02:34:44
 @@ -90,6 +90,7 @@ int delete_after = 0;
  int only_existing = 0;
@@ -62,7 +62,7 @@
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, OPT_TIMEOUT, 0, 0 },
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
-@@ -589,6 +593,32 @@ int parse_arguments(int *argc, const cha
+@@ -604,6 +608,32 @@ int parse_arguments(int *argc, const cha
                        read_batch = 1;
                        break;
  
@@ -95,7 +95,7 @@
                case OPT_TIMEOUT:
                        if (io_timeout && io_timeout < select_timeout)
                                select_timeout = io_timeout;
-@@ -938,6 +968,11 @@ void server_options(char **args,int *arg
+@@ -983,6 +1013,11 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -107,7 +107,7 @@
        if (io_timeout) {
                if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
                        goto oom;
---- orig/rsync.yo      2004-07-29 16:08:04
+--- orig/rsync.yo      2004-08-11 17:26:27
 +++ rsync.yo   2004-07-03 20:20:46
 @@ -316,6 +316,7 @@ verb(
       --delete-after          receiver deletes after transfer, not before
@@ -117,7 +117,7 @@
       --partial               keep partially transferred files
       --partial-dir=DIR       put a partially transferred file into DIR
       --force                 force deletion of dirs even if not empty
-@@ -593,6 +594,11 @@ dit(bf(--max-delete=NUM)) This tells rsy
+@@ -599,6 +600,11 @@ dit(bf(--max-delete=NUM)) This tells rsy
  files or directories. This is useful when mirroring very large trees
  to prevent disasters.