From f80ebf7ee3dcee0f41618701ba48e4492c0b6ab8 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 28 Apr 2007 18:09:54 +0000 Subject: [PATCH] A few more tweaks. --- ignore-case.diff | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/ignore-case.diff b/ignore-case.diff index 02b00ee..1eea18b 100644 --- a/ignore-case.diff +++ b/ignore-case.diff @@ -42,7 +42,7 @@ To use this patch, run these commands for a successful build: return !ret_match; --- old/flist.c +++ new/flist.c -@@ -34,6 +34,7 @@ extern int inc_recurse; +@@ -35,6 +35,7 @@ extern int inc_recurse; extern int do_progress; extern int always_checksum; extern int module_id; @@ -50,30 +50,29 @@ To use this patch, run these commands for a successful build: extern int ignore_errors; extern int numeric_ids; extern int recurse; -@@ -2224,7 +2225,7 @@ int f_name_cmp(struct file_struct *f1, s - if (type1 != type2) - return type1 == t_PATH ? 1 : -1; - -- do { -+ while (1) { - if (!*c1) { - switch (state1) { - case s_DIR: -@@ -2287,7 +2288,16 @@ int f_name_cmp(struct file_struct *f1, s +@@ -2390,7 +2391,7 @@ enum fnc_type { t_PATH, t_ITEM }; + int f_name_cmp(struct file_struct *f1, struct file_struct *f2) + { + int dif; +- const uchar *c1, *c2; ++ const uchar *c1, *c2, ch1, ch2; + enum fnc_state state1, state2; + enum fnc_type type1, type2; + enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM; +@@ -2500,7 +2501,15 @@ 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); ++ ch1 = CVAL(c1++, 0); ++ ch2 = CVAL(c2++, 0); + if (ignore_case) { -+ uchar ch1, ch2; -+ ch1 = islower(*c1) ? toupper(*c1) : *c1; -+ ch2 = islower(*c2) ? toupper(*c2) : *c2; -+ c1++, c2++; -+ if ((dif = (int)ch1 - (int)ch2) != 0) -+ break; -+ } else if ((dif = (int)*c1++ - (int)*c2++) != 0) -+ break; -+ } ++ if (islower(ch1)) ++ ch1 = toupper(ch1); ++ if (islower(ch2)) ++ ch2 = toupper(ch2); ++ } ++ } while ((dif = ch1 - ch2) == 0); return dif; } @@ -164,7 +163,7 @@ To use this patch, run these commands for a successful build: --- old/options.c +++ new/options.c -@@ -112,6 +112,7 @@ OFF_T max_size = 0; +@@ -113,6 +113,7 @@ OFF_T max_size = 0; OFF_T min_size = 0; int ignore_errors = 0; int modify_window = 0; @@ -172,7 +171,7 @@ To use this patch, run these commands for a successful build: int blocking_io = -1; int checksum_seed = 0; int inplace = 0; -@@ -367,6 +368,7 @@ void usage(enum logcode F) +@@ -388,6 +389,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"); @@ -180,7 +179,7 @@ To use this patch, run these commands for a successful build: 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"); -@@ -539,6 +541,7 @@ static struct poptOption long_options[] +@@ -567,6 +569,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}, @@ -188,7 +187,7 @@ To use this patch, run these commands for a successful build: {"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 }, -@@ -1738,6 +1741,9 @@ void server_options(char **args,int *arg +@@ -1834,6 +1837,9 @@ void server_options(char **args,int *arg args[ac++] = arg; } -- 2.34.1