From: Wayne Davison <wayned@samba.org>
Date: Tue, 18 Oct 2005 08:19:24 +0000 (+0000)
Subject: Fixed failing hunks.
X-Git-Tag: v3.0.5~507
X-Git-Url: http://git.samba.org/samba.git/?p=rsync-patches.git;a=commitdiff_plain;h=56208f7b4b4820f56f53a42b0caf4801dd218f30

Fixed failing hunks.
---

diff --git a/fsync.diff b/fsync.diff
index f6674ab..7d7b6ee 100644
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,7 +1,7 @@
 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-08-27 21:11:26
+--- orig/options.c	2005-10-15 16:39:46
 +++ options.c	2005-08-27 21:21:34
 @@ -41,6 +41,7 @@ int whole_file = -1;
  int append_mode = 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;
-@@ -312,6 +313,7 @@ void usage(enum logcode F)
+@@ -313,6 +314,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");
-@@ -467,6 +469,7 @@ static struct poptOption long_options[] 
+@@ -471,6 +473,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 },
-@@ -1495,6 +1498,9 @@ void server_options(char **args,int *arg
+@@ -1560,6 +1563,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-08-17 06:45:08
+--- orig/receiver.c	2005-09-16 05:41:02
 +++ 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;
-@@ -318,6 +319,12 @@ static int receive_data(int f_in, char *
+@@ -319,6 +320,12 @@ static int receive_data(int f_in, char *
  		exit_cleanup(RERR_FILEIO);
  	}
  
@@ -60,27 +60,27 @@ to be called on every file we write.
  	sum_end(file_sum1);
  
  	if (mapbuf)
---- orig/t_stub.c	2005-01-25 10:39:14
-+++ t_stub.c	2004-10-09 04:03:09
-@@ -28,6 +28,7 @@
- 
+--- 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;
  int module_id = -1;
+ int relative_paths = 0;
 +int do_fsync;
  char *partial_dir;
  struct filter_list_struct server_filter_list;
  
---- orig/util.c	2005-08-17 06:45:08
-+++ util.c	2004-07-03 20:18:13
-@@ -33,6 +33,7 @@ extern int module_id;
+--- 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;
+ extern int module_id;
  extern int modify_window;
+ extern int relative_paths;
++extern int do_fsync;
  extern char *partial_dir;
  extern struct filter_list_struct server_filter_list;
-+extern int do_fsync;
- 
- int sanitize_paths = 0;
  
-@@ -310,6 +311,12 @@ int copy_file(char *source, char *dest, 
+@@ -311,6 +312,12 @@ int copy_file(char *source, char *dest, 
  		return -1;
  	}
  
diff --git a/ignore-case.diff b/ignore-case.diff
index 406a683..3aef46b 100644
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -35,17 +35,17 @@ in a case-insensitive manner.
  	  case '?':
  	    /* Match anything but '/'. */
  	    if (*text == '/')
---- orig/options.c	2005-10-14 18:50:49
+--- orig/options.c	2005-10-15 16:39:46
 +++ options.c	2005-10-14 19:19:18
-@@ -101,6 +101,7 @@ int max_delete = 0;
- OFF_T max_size = 0;
+@@ -102,6 +102,7 @@ OFF_T max_size = 0;
+ OFF_T min_size = 0;
  int ignore_errors = 0;
  int modify_window = 0;
 +int ignore_case = 0;
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -332,6 +333,7 @@ void usage(enum logcode F)
+@@ -334,6 +335,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");
-@@ -468,6 +470,7 @@ static struct poptOption long_options[] 
+@@ -471,6 +473,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 },
-@@ -1501,6 +1504,9 @@ void server_options(char **args,int *arg
+@@ -1521,6 +1524,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-01-25 10:39:14
-+++ t_stub.c	2004-08-13 17:19:56
-@@ -28,6 +28,7 @@
- 
+--- orig/t_stub.c	2005-10-16 22:38:39
++++ t_stub.c	2005-10-18 08:18:25
+@@ -29,6 +29,7 @@
  int modify_window = 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-08-17 06:45:08
-+++ util.c	2004-08-13 16:40:34
-@@ -31,6 +31,7 @@ extern int verbose;
- extern int dry_run;
+--- 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;
  extern int module_id;
  extern int modify_window;
+ extern int relative_paths;
 +extern int ignore_case;
  extern char *partial_dir;
  extern struct filter_list_struct server_filter_list;
  
-@@ -1039,11 +1040,23 @@ int u_strcmp(const char *cs1, const char
+@@ -1044,11 +1045,23 @@ int u_strcmp(const char *cs1, const char
  {
  	const uchar *s1 = (const uchar *)cs1;
  	const uchar *s2 = (const uchar *)cs2;