Got rid of fuzz.

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

diff --git a/max-size.diff b/max-size.diff
index e5a5ce5..9ae2abb 100644 (file)
--- a/max-size.diff
+++ b/max-size.diff
@@ -1,4 +1,4 @@
---- orig/generator.c   2004-09-20 19:50:13
+--- orig/generator.c   2004-10-06 00:12:16
 +++ generator.c        2004-07-03 20:20:46
 @@ -41,6 +41,7 @@ extern int make_backups;
  extern int csum_length;
@@ -19,7 +19,7 @@
        }
  
        if (preserve_links && S_ISLNK(file->mode)) {
---- orig/options.c     2004-09-23 17:42:07
+--- orig/options.c     2004-10-14 17:11:40
 +++ options.c  2004-08-13 18:26:04
 @@ -90,6 +90,7 @@ int delete_after = 0;
  int only_existing = 0;
@@ -45,8 +45,8 @@
    rprintf(F,"     --partial               keep partially transferred files\n");
    rprintf(F,"     --partial-dir=DIR       put a partially transferred file into DIR\n");
    rprintf(F,"     --force                 force deletion of directories even if not empty\n");
-@@ -319,7 +322,7 @@ void usage(enum logcode F)
- enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+@@ -312,7 +315,7 @@ void usage(enum logcode F)
+ enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
 -      OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
@@ -54,7 +54,7 @@
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -374,6 +377,7 @@ static struct poptOption long_options[] 
+@@ -367,6 +370,7 @@ static struct poptOption long_options[] 
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
    {"block-size",      'B', POPT_ARG_INT,    &block_size, 0, 0, 0 },
    {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 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 },
-@@ -600,6 +604,33 @@ int parse_arguments(int *argc, const cha
+@@ -667,6 +671,33 @@ int parse_arguments(int *argc, const cha
                        read_batch = 1;
                        break;
  
@@ -96,7 +96,7 @@
                case OPT_TIMEOUT:
                        if (io_timeout && io_timeout < select_timeout)
                                select_timeout = io_timeout;
-@@ -993,6 +1024,11 @@ void server_options(char **args,int *arg
+@@ -1050,6 +1081,11 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -108,7 +108,7 @@
        if (io_timeout) {
                if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
                        goto oom;
---- orig/rsync.yo      2004-09-24 16:42:30
+--- orig/rsync.yo      2004-10-06 00:12:16
 +++ rsync.yo   2004-07-03 20:20:46
 @@ -345,6 +345,7 @@ verb(
       --delete-after          receiver deletes after transfer, not before