Fixed failing hunks.

diff --git a/fsync.diff b/fsync.diff
index 7d7b6ee17712f601e7c9ba1a243e5abcfe481650..6871d9d3ae2ae8178e7177dc1fe8cbfe75bc4cc5 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,9 +1,9 @@
 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-10-15 16:39:46
+--- orig/options.c     2005-11-12 20:13:05
 +++ options.c  2005-08-27 21:21:34
-@@ -41,6 +41,7 @@ int whole_file = -1;
+@@ -42,6 +42,7 @@ int whole_file = -1;
  int append_mode = 0;
  int keep_dirlinks = 0;
  int copy_links = 0;
@@ -11,7 +11,7 @@ to be called on every file we write.
  int preserve_links = 0;
  int preserve_hard_links = 0;
  int preserve_perms = 0;
-@@ -313,6 +314,7 @@ void usage(enum logcode F)
+@@ -320,6 +321,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");
-@@ -471,6 +473,7 @@ static struct poptOption long_options[] 
+@@ -485,6 +487,7 @@ static struct poptOption long_options[] 
    {"only-write-batch", 0,  POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
    {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
    {"from0",           '0', POPT_ARG_NONE,   &eol_nulls, 0, 0, 0},
@@ -27,7 +27,7 @@ to be called on every file we write.
    {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids, 0, 0, 0 },
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1560,6 +1563,9 @@ void server_options(char **args,int *arg
+@@ -1602,6 +1605,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-09-16 05:41:02
+--- orig/receiver.c    2005-11-10 16:58:36
 +++ receiver.c 2005-02-20 00:17:37
 @@ -38,6 +38,7 @@ extern int keep_dirlinks;
  extern int preserve_hard_links;
@@ -60,27 +60,27 @@ to be called on every file we write.
        sum_end(file_sum1);
  
        if (mapbuf)
---- orig/t_stub.c      2005-10-16 22:38:39
-+++ t_stub.c   2005-10-18 08:16:12
-@@ -29,6 +29,7 @@
- int modify_window = 0;
+--- orig/t_stub.c      2005-11-12 20:13:05
++++ t_stub.c   2005-11-12 20:13:29
+@@ -30,6 +30,7 @@ int modify_window = 0;
  int module_id = -1;
  int relative_paths = 0;
+ int human_readable = 0;
 +int do_fsync;
  char *partial_dir;
  struct filter_list_struct server_filter_list;
  
---- orig/util.c        2005-10-16 22:38:40
-+++ util.c     2005-10-18 08:17:00
-@@ -32,6 +32,7 @@ extern int dry_run;
+--- orig/util.c        2005-11-12 20:13:05
++++ util.c     2005-11-12 20:13:44
+@@ -30,6 +30,7 @@
+ extern int verbose;
+ extern int dry_run;
  extern int module_id;
++extern int do_fsync;
  extern int modify_window;
  extern int relative_paths;
-+extern int do_fsync;
- extern char *partial_dir;
- extern struct filter_list_struct server_filter_list;
- 
-@@ -311,6 +312,12 @@ int copy_file(char *source, char *dest, 
+ extern int human_readable;
+@@ -312,6 +313,12 @@ int copy_file(char *source, char *dest, 
                return -1;
        }
  

diff --git a/ignore-case.diff b/ignore-case.diff
index 3aef46b3cd04b47c006a03a3a286c002b3b55841..65b0716cafa63a3359173e4fb8666679ff1420d5 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -35,9 +35,9 @@ in a case-insensitive manner.
          case '?':
            /* Match anything but '/'. */
            if (*text == '/')
---- orig/options.c     2005-10-15 16:39:46
+--- orig/options.c     2005-11-12 20:13:05
 +++ options.c  2005-10-14 19:19:18
-@@ -102,6 +102,7 @@ OFF_T max_size = 0;
+@@ -105,6 +105,7 @@ OFF_T max_size = 0;
  OFF_T min_size = 0;
  int ignore_errors = 0;
  int modify_window = 0;
@@ -45,7 +45,7 @@ in a case-insensitive manner.
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -334,6 +335,7 @@ void usage(enum logcode F)
+@@ -342,6 +343,7 @@ void usage(enum logcode F)
    rprintf(F,"     --include-from=FILE     read include patterns from FILE\n");
    rprintf(F,"     --files-from=FILE       read list of source-file names from FILE\n");
    rprintf(F," -0, --from0                 all *-from/filter files are delimited by 0s\n");
@@ -53,7 +53,7 @@ in a case-insensitive manner.
    rprintf(F,"     --address=ADDRESS       bind address for outgoing socket to daemon\n");
    rprintf(F,"     --port=PORT             specify double-colon alternate port number\n");
    rprintf(F,"     --blocking-io           use blocking I/O for the remote shell\n");
-@@ -471,6 +473,7 @@ static struct poptOption long_options[] 
+@@ -485,6 +487,7 @@ static struct poptOption long_options[] 
    {"only-write-batch", 0,  POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
    {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
    {"from0",           '0', POPT_ARG_NONE,   &eol_nulls, 0, 0, 0},
@@ -61,7 +61,7 @@ in a case-insensitive manner.
    {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids, 0, 0, 0 },
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1521,6 +1524,9 @@ void server_options(char **args,int *arg
+@@ -1563,6 +1566,9 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
  
@@ -71,27 +71,27 @@ in a case-insensitive manner.
        if (partial_dir && am_sender) {
                if (partial_dir != partialdir_for_delayupdate) {
                        args[ac++] = "--partial-dir";
---- orig/t_stub.c      2005-10-16 22:38:39
-+++ t_stub.c   2005-10-18 08:18:25
-@@ -29,6 +29,7 @@
+--- orig/t_stub.c      2005-11-12 20:13:05
++++ t_stub.c   2005-11-12 20:14:28
+@@ -27,6 +27,7 @@
+  **/
+ 
  int modify_window = 0;
++int ignore_case = 0;
  int module_id = -1;
  int relative_paths = 0;
-+int ignore_case = 0;
- char *partial_dir;
- struct filter_list_struct server_filter_list;
- 
---- orig/util.c        2005-10-16 22:38:40
-+++ util.c     2005-10-18 08:18:39
-@@ -32,6 +32,7 @@ extern int dry_run;
+ int human_readable = 0;
+--- orig/util.c        2005-11-12 20:13:05
++++ util.c     2005-11-12 20:14:39
+@@ -30,6 +30,7 @@
+ extern int verbose;
+ extern int dry_run;
  extern int module_id;
++extern int ignore_case;
  extern int modify_window;
  extern int relative_paths;
-+extern int ignore_case;
- extern char *partial_dir;
- extern struct filter_list_struct server_filter_list;
- 
-@@ -1044,11 +1045,23 @@ int u_strcmp(const char *cs1, const char
+ extern int human_readable;
+@@ -1045,11 +1046,23 @@ int u_strcmp(const char *cs1, const char
  {
        const uchar *s1 = (const uchar *)cs1;
        const uchar *s2 = (const uchar *)cs2;