Fix failing hunks.

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

diff --git a/max-size.diff b/max-size.diff
index 56802e4..2241f2c 100644 (file)
--- a/max-size.diff
+++ b/max-size.diff
@@ -1,4 +1,4 @@
---- orig/generator.c   2004-07-17 16:30:20
+--- orig/generator.c   2004-07-28 10:05:29
 +++ generator.c        2004-07-03 20:20:46
 @@ -39,6 +39,7 @@ extern int opt_ignore_existing;
  extern int csum_length;
@@ -8,9 +8,9 @@
  extern int io_timeout;
  extern int protocol_version;
  extern int always_checksum;
-@@ -328,6 +329,10 @@ static void recv_generator(char *fname, 
+@@ -336,6 +337,10 @@ static void recv_generator(char *fname, 
                    && verbose && f_out != -1)
-                       rprintf(FINFO,"%s/\n",fname);
+                       rprintf(FINFO, "%s/\n", safe_fname(fname));
                return;
 +      } else if (max_size && file->length > max_size) {
 +              if (verbose > 1)
@@ -19,7 +19,7 @@
        }
  
        if (preserve_links && S_ISLNK(file->mode)) {
---- orig/options.c     2004-07-16 20:07:22
+--- orig/options.c     2004-07-23 17:16:13
 +++ options.c  2004-07-15 02:34:44
 @@ -90,6 +90,7 @@ int delete_after = 0;
  int only_existing = 0;
@@ -37,7 +37,7 @@
  
  /** Local address to bind.  As a character string because it's
   * interpreted by the IPv6 layer: should be a numeric IP4 or IP6
-@@ -266,6 +268,7 @@ void usage(enum logcode F)
+@@ -267,6 +269,7 @@ void usage(enum logcode F)
    rprintf(F,"     --delete-after          receiver deletes after transferring, not before\n");
    rprintf(F,"     --ignore-errors         delete even if there are I/O errors\n");
    rprintf(F,"     --max-delete=NUM        don't delete more than NUM files\n");
@@ -45,7 +45,7 @@
    rprintf(F,"     --partial               keep partially transferred files\n");
    rprintf(F,"     --force                 force deletion of directories even if not empty\n");
    rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");
-@@ -316,7 +319,7 @@ void usage(enum logcode F)
+@@ -317,7 +320,7 @@ void usage(enum logcode F)
  enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
@@ -54,7 +54,7 @@
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -371,6 +374,7 @@ static struct poptOption long_options[] 
+@@ -372,6 +375,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 },
-@@ -585,6 +589,32 @@ int parse_arguments(int *argc, const cha
+@@ -586,6 +590,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;
-@@ -918,6 +948,11 @@ void server_options(char **args,int *arg
+@@ -924,6 +954,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-19 08:27:29
+--- orig/rsync.yo      2004-07-24 16:52:10
 +++ rsync.yo   2004-07-03 20:20:46
 @@ -316,6 +316,7 @@ verb(
       --delete-after          receiver deletes after transfer, not before