Fixed some patch fuzz.

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

diff --git a/min-size.diff b/min-size.diff
index 7e62be3..5493855 100644 (file)
--- a/min-size.diff
+++ b/min-size.diff
@@ -1,6 +1,6 @@
---- orig/generator.c   2005-05-19 08:52:42
+--- orig/generator.c   2005-08-17 06:45:07
 +++ generator.c        2005-04-28 16:19:24
-@@ -58,6 +58,7 @@ extern int make_backups;
+@@ -59,6 +59,7 @@ extern int make_backups;
  extern int csum_length;
  extern int ignore_times;
  extern int size_only;
@@ -8,7 +8,7 @@
  extern OFF_T max_size;
  extern int io_error;
  extern int allowed_lull;
-@@ -836,6 +837,15 @@ static void recv_generator(char *fname, 
+@@ -864,6 +865,15 @@ static void recv_generator(char *fname, 
                return;
        }
  
@@ -24,7 +24,7 @@
        if (max_size && file->length > max_size) {
                if (verbose > 1) {
                        if (the_file_list->count == 1)
-@@ -1236,7 +1246,7 @@ void generate_files(int f_out, struct fi
+@@ -1269,7 +1279,7 @@ void generate_files(int f_out, struct fi
  
        phase++;
        csum_length = SUM_LENGTH;
@@ -32,9 +32,9 @@
 +      only_existing = min_size = max_size = opt_ignore_existing = 0;
        update_only = always_checksum = size_only = 0;
        ignore_times = 1;
-       make_backups = 0; /* avoid a duplicate backup for inplace processing */
---- orig/options.c     2005-05-19 08:52:42
-+++ options.c  2005-05-19 08:57:19
+       if (append_mode)  /* resend w/o append mode */
+--- orig/options.c     2005-08-27 21:11:26
++++ options.c  2005-08-27 21:23:36
 @@ -98,6 +98,7 @@ int only_existing = 0;
  int opt_ignore_existing = 0;
  int need_messages_from_generator = 0;
@@ -43,16 +43,16 @@
  OFF_T max_size = 0;
  int ignore_errors = 0;
  int modify_window = 0;
-@@ -166,7 +167,7 @@ static int modify_window_set;
- static int itemize_changes = 0;
+@@ -167,7 +168,7 @@ static int itemize_changes = 0;
  static int refused_delete, refused_archive_part;
  static int refused_partial, refused_progress, refused_delete_before;
+ static int refused_inplace;
 -static char *max_size_arg;
 +static char *min_size_arg, *max_size_arg;
  static char partialdir_for_delayupdate[] = ".~tmp~";
  
  /** Local address to bind.  As a character string because it's
-@@ -307,6 +308,7 @@ void usage(enum logcode F)
+@@ -308,6 +309,7 @@ void usage(enum logcode F)
    rprintf(F,"     --ignore-errors         delete even if there are I/O errors\n");
    rprintf(F,"     --force                 force deletion of directories even if not empty\n");
    rprintf(F,"     --max-delete=NUM        don't delete more than NUM files\n");
@@ -69,15 +69,15 @@
        OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
        OPT_REFUSED_BASE = 9000};
  
-@@ -426,6 +428,7 @@ static struct poptOption long_options[] 
-   {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-   {"block-size",      'B', POPT_ARG_LONG,   &block_size, 0, 0, 0 },
-   {"max-delete",       0,  POPT_ARG_INT,    &max_delete, 0, 0, 0 },
+@@ -417,6 +419,7 @@ static struct poptOption long_options[] 
+   {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
+   {"existing",         0,  POPT_ARG_NONE,   &only_existing, 0, 0, 0 },
+   {"ignore-existing",  0,  POPT_ARG_NONE,   &opt_ignore_existing, 0, 0, 0 },
 +  {"min-size",         0,  POPT_ARG_STRING, &min_size_arg,  OPT_MIN_SIZE, 0, 0 },
    {"max-size",         0,  POPT_ARG_STRING, &max_size_arg,  OPT_MAX_SIZE, 0, 0 },
-   {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
-   {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
-@@ -834,6 +837,15 @@ int parse_arguments(int *argc, const cha
+   {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
+   {"inplace",          0,  POPT_ARG_NONE,   &inplace, 0, 0, 0 },
+@@ -874,6 +877,15 @@ int parse_arguments(int *argc, const cha
                        read_batch = 1;
                        break;
  
@@ -93,7 +93,7 @@
                case OPT_MAX_SIZE:
                        if ((max_size = parse_size_arg(max_size_arg)) <= 0) {
                                snprintf(err_buf, sizeof err_buf,
-@@ -1348,6 +1360,11 @@ void server_options(char **args,int *arg
+@@ -1395,6 +1407,11 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -105,7 +105,7 @@
        if (max_size && am_sender) {
                args[ac++] = "--max-size";
                args[ac++] = max_size_arg;
---- orig/rsync.yo      2005-05-10 23:47:12
+--- orig/rsync.yo      2005-08-27 21:05:12
 +++ rsync.yo   2005-05-06 19:12:35
 @@ -342,6 +342,7 @@ to the detailed description below for a 
       --ignore-errors         delete even if there are I/O errors
@@ -115,7 +115,7 @@
       --max-size=SIZE         don't transfer any file larger than SIZE
       --partial               keep partially transferred files
       --partial-dir=DIR       put a partially transferred file into DIR
-@@ -758,10 +759,16 @@ dit(bf(--max-delete=NUM)) This tells rsy
+@@ -794,10 +795,16 @@ dit(bf(--max-delete=NUM)) This tells rsy
  files or directories (NUM must be non-zero).
  This is useful when mirroring very large trees to prevent disasters.