--- old/flist.c
+++ new/flist.c
-@@ -37,6 +37,7 @@ extern int am_sender;
+@@ -32,6 +32,7 @@ extern int am_sender;
extern int do_progress;
extern int always_checksum;
extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
extern int recurse;
-@@ -1801,7 +1802,14 @@ int f_name_cmp(struct file_struct *f1, s
+@@ -1786,7 +1787,7 @@ int f_name_cmp(struct file_struct *f1, s
+ if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
- while (1) {
-- if ((dif = (int)*c1++ - (int)*c2++) != 0)
+- do {
++ while (1) {
+ if (!*c1) {
+ switch (state1) {
+ case s_DIR:
+@@ -1849,7 +1850,16 @@ int f_name_cmp(struct file_struct *f1, s
+ if (type1 != type2)
+ return type1 == t_PATH ? 1 : -1;
+ }
+- } while ((dif = (int)*c1++ - (int)*c2++) == 0);
+ if (ignore_case) {
+ uchar ch1, ch2;
+ ch1 = islower(*c1) ? toupper(*c1) : *c1;
+ if ((dif = (int)ch1 - (int)ch2) != 0)
+ break;
+ } else if ((dif = (int)*c1++ - (int)*c2++) != 0)
- break;
- if (!*c1) {
- switch (state1) {
++ break;
++ }
+
+ return dif;
+ }
--- old/lib/wildmatch.c
+++ new/lib/wildmatch.c
@@ -53,6 +53,8 @@
/* Match the "pattern" against the forced-to-lower-case "text" string. */
--- old/options.c
+++ new/options.c
-@@ -110,6 +110,7 @@ OFF_T max_size = 0;
+@@ -111,6 +111,7 @@ OFF_T max_size = 0;
OFF_T min_size = 0;
int ignore_errors = 0;
int modify_window = 0;
int blocking_io = -1;
int checksum_seed = 0;
int inplace = 0;
-@@ -349,6 +350,7 @@ void usage(enum logcode F)
+@@ -359,6 +360,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");
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," --sockopts=OPTIONS specify custom TCP options\n");
-@@ -501,6 +503,7 @@ static struct poptOption long_options[]
+@@ -521,6 +523,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},
{"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 },
-@@ -1655,6 +1658,9 @@ void server_options(char **args,int *arg
+@@ -1684,6 +1687,9 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}
args[ac++] = "--partial-dir";
--- old/wildtest.c
+++ new/wildtest.c
-@@ -16,6 +16,7 @@ int fnmatch_errors = 0;
+@@ -32,6 +32,7 @@ int fnmatch_errors = 0;
#endif
int wildmatch_errors = 0;