Fixed a failing hunk.

diff --git a/fsync.diff b/fsync.diff
index 960938d..f14a026 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,17 +1,17 @@
 This patch from Sami Farin lets you specify --fsync if you want fsync()
 to be called on every file we write.
 
---- orig/options.c     2005-05-19 08:52:42
-+++ options.c  2005-01-28 19:30:47
-@@ -38,6 +38,7 @@ int make_backups = 0;
-  **/
- int whole_file = -1;
- 
-+int do_fsync = 0;
+--- orig/options.c     2005-07-28 01:46:25
++++ options.c  2005-07-28 01:47:53
+@@ -42,6 +42,7 @@ int append_mode = 0;
  int archive_mode = 0;
  int keep_dirlinks = 0;
  int copy_links = 0;
-@@ -311,6 +312,7 @@ void usage(enum logcode F)
++int do_fsync = 0;
+ int preserve_links = 0;
+ int preserve_hard_links = 0;
+ int preserve_perms = 0;
+@@ -314,6 +315,7 @@ void usage(enum logcode F)
    rprintf(F,"     --partial               keep partially transferred files\n");
    rprintf(F,"     --partial-dir=DIR       put a partially transferred file into DIR\n");
    rprintf(F,"     --delay-updates         put all updated files into place at transfer's end\n");
@@ -19,7 +19,7 @@ to be called on every file we write.
    rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
-@@ -395,6 +397,7 @@ static struct poptOption long_options[] 
+@@ -398,6 +400,7 @@ static struct poptOption long_options[] 
    {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
    {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
@@ -27,7 +27,7 @@ to be called on every file we write.
    {"dry-run",         'n', POPT_ARG_NONE,   &dry_run, 0, 0, 0 },
    {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
    {"cvs-exclude",     'C', POPT_ARG_NONE,   &cvs_exclude, 0, 0, 0 },
-@@ -1446,6 +1449,9 @@ void server_options(char **args,int *arg
+@@ -1471,6 +1474,9 @@ void server_options(char **args,int *arg
                args[ac++] = tmpdir;
        }
  
@@ -37,7 +37,7 @@ to be called on every file we write.
        if (basis_dir[0] && am_sender) {
                /* the server only needs this option if it is not the sender,
                 *   and it may be an older version that doesn't know this
---- orig/receiver.c    2005-04-14 01:53:12
+--- orig/receiver.c    2005-07-28 01:46:25
 +++ receiver.c 2005-02-20 00:17:37
 @@ -38,6 +38,7 @@ extern int keep_dirlinks;
  extern int preserve_hard_links;
@@ -47,7 +47,7 @@ to be called on every file we write.
  extern int basis_dir_cnt;
  extern int make_backups;
  extern int cleanup_got_literal;
-@@ -291,6 +292,12 @@ static int receive_data(int f_in, char *
+@@ -314,6 +315,12 @@ static int receive_data(int f_in, char *
                exit_cleanup(RERR_FILEIO);
        }
  
@@ -70,7 +70,7 @@ to be called on every file we write.
  char *partial_dir;
  struct filter_list_struct server_filter_list;
  
---- orig/util.c        2005-05-03 16:47:33
+--- orig/util.c        2005-07-27 23:31:12
 +++ util.c     2004-07-03 20:18:13
 @@ -33,6 +33,7 @@ extern int module_id;
  extern int modify_window;
@@ -80,7 +80,7 @@ to be called on every file we write.
  
  int sanitize_paths = 0;
  
-@@ -299,6 +300,12 @@ int copy_file(char *source, char *dest, 
+@@ -310,6 +311,12 @@ int copy_file(char *source, char *dest, 
                return -1;
        }
  

diff --git a/min-size.diff b/min-size.diff
index 2aa2b3c..95b522c 100644 (file)
--- a/min-size.diff
+++ b/min-size.diff
@@ -1,6 +1,6 @@
---- orig/generator.c   2005-05-22 20:53:34
+--- orig/generator.c   2005-07-28 01:46:25
 +++ 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;
-@@ -832,6 +833,15 @@ static void recv_generator(char *fname, 
+@@ -842,6 +843,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)
-@@ -1232,7 +1242,7 @@ void generate_files(int f_out, struct fi
+@@ -1247,7 +1257,7 @@ void generate_files(int f_out, struct fi
  
        phase++;
        csum_length = SUM_LENGTH;
@@ -32,10 +32,10 @@
 +      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
-@@ -98,6 +98,7 @@ int only_existing = 0;
+       if (append_mode)  /* resend w/o append mode */
+--- orig/options.c     2005-07-28 01:46:25
++++ options.c  2005-07-28 01:48:23
+@@ -99,6 +99,7 @@ int only_existing = 0;
  int opt_ignore_existing = 0;
  int need_messages_from_generator = 0;
  int max_delete = 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;
+@@ -168,7 +169,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)
+@@ -310,6 +311,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");
@@ -60,7 +60,7 @@
    rprintf(F,"     --max-size=SIZE         don't transfer any file larger than SIZE\n");
    rprintf(F,"     --partial               keep partially transferred files\n");
    rprintf(F,"     --partial-dir=DIR       put a partially transferred file into DIR\n");
-@@ -362,7 +364,7 @@ void usage(enum logcode F)
+@@ -365,7 +367,7 @@ void usage(enum logcode F)
  
  enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
@@ -69,7 +69,7 @@
        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[] 
+@@ -430,6 +432,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 },
@@ -77,7 +77,7 @@
    {"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
+@@ -840,6 +843,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
+@@ -1371,6 +1383,11 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -105,9 +105,9 @@
        if (max_size && am_sender) {
                args[ac++] = "--max-size";
                args[ac++] = max_size_arg;
---- orig/rsync.yo      2005-05-22 20:53:34
+--- orig/rsync.yo      2005-07-28 01:46:25
 +++ rsync.yo   2005-05-06 19:12:35
-@@ -342,6 +342,7 @@ to the detailed description below for a 
+@@ -332,6 +332,7 @@ to the detailed description below for a 
       --ignore-errors         delete even if there are I/O errors
       --force                 force deletion of dirs even if not empty
       --max-delete=NUM        don't delete more than NUM files
@@ -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
+@@ -756,10 +757,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.