This adds the --ignore-case option, which makes rsync compare filenames
in a case-insensitive manner.
---- orig/lib/wildmatch.c 2003-07-14 15:12:59
-+++ lib/wildmatch.c 2004-08-13 16:43:27
+--- orig/flist.c 2006-01-19 21:17:11
++++ flist.c 2006-01-20 20:10:25
+@@ -37,6 +37,7 @@ extern int am_sender;
+ extern int do_progress;
+ extern int always_checksum;
+ extern int module_id;
++extern int ignore_case;
+ extern int ignore_errors;
+ extern int numeric_ids;
+ extern int recurse;
+@@ -1707,7 +1708,14 @@ int f_name_cmp(struct file_struct *f1, s
+ return type1 == t_PATH ? 1 : -1;
+
+ while (1) {
+- if ((dif = (int)*c1++ - (int)*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 (!*c1) {
+ switch (state1) {
+--- orig/lib/wildmatch.c 2006-01-14 08:14:31
++++ lib/wildmatch.c 2006-01-03 17:29:11
@@ -53,6 +53,8 @@
#define ISUPPER(c) (ISASCII(c) && isupper(c))
#define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
#ifdef WILD_TEST_ITERATIONS
int wildmatch_iteration_count;
#endif
-@@ -76,9 +78,19 @@ static int domatch(const unsigned char *
- ch = *++p;
- /* FALLTHROUGH */
- default:
-- if (*text != ch)
-- return FALSE;
-- continue;
-+ if (*text == ch)
-+ continue;
-+ if (ignore_case) {
-+ if (ISUPPER(*text)) {
-+ if (tolower(*text) == ch)
-+ continue;
-+ }
-+ else if (ISUPPER(ch)) {
-+ if (*text == tolower(ch))
-+ continue;
-+ }
-+ }
-+ return FALSE;
- case '?':
- /* Match anything but '/'. */
- if (*text == '/')
---- orig/options.c 2004-09-20 05:10:48
-+++ options.c 2004-07-29 16:13:45
-@@ -92,6 +92,7 @@ int opt_ignore_existing = 0;
- int max_delete = 0;
+@@ -72,6 +74,8 @@ static int dowild(const uchar *p, const
+ for ( ; (p_ch = *p) != '\0'; text++, p++) {
+ int matched, special;
+ uchar t_ch, prev_ch;
++ if (ignore_case && ISUPPER(p_ch))
++ p_ch = tolower(p_ch);
+ while ((t_ch = *text) == '\0') {
+ if (*a == NULL) {
+ if (p_ch != '*')
+@@ -288,10 +292,14 @@ static const uchar *trailing_N_elements(
+ int wildmatch(const char *pattern, const char *text)
+ {
+ static const uchar *nomore[1]; /* A NULL pointer. */
++ int ret;
+ #ifdef WILD_TEST_ITERATIONS
+ wildmatch_iteration_count = 0;
+ #endif
+- return dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
++ force_lower_case = ignore_case;
++ ret = dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
++ force_lower_case = 0;
++ return ret;
+ }
+
+ /* Match the "pattern" against the forced-to-lower-case "text" string. */
+--- orig/options.c 2006-01-20 18:44:02
++++ options.c 2005-10-14 19:19:18
+@@ -105,6 +105,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;
-@@ -288,6 +289,7 @@ void usage(enum logcode F)
- rprintf(F," --include-from=FILE don't exclude patterns listed in FILE\n");
- rprintf(F," --files-from=FILE read FILE for list of source-file names\n");
- rprintf(F," -0, --from0 all *-from file lists are delimited by nulls\n");
+@@ -339,6 +340,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," --ignore-case ignore case when comparing filenames\n");
- rprintf(F," --version print version number\n");
- rprintf(F," --daemon run as an rsync daemon\n");
- rprintf(F," --no-detach do not detach from the parent\n");
-@@ -343,6 +345,7 @@ static struct poptOption long_options[]
- {"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 },
- {"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 },
- {"include-from", 0, POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 0 },
+ 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");
+@@ -482,6 +484,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},
+ {"ignore-case", 0, POPT_ARG_NONE, &ignore_case, 0, 0, 0 },
- {"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 },
-@@ -1042,6 +1045,9 @@ void server_options(char **args,int *arg
+ {"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 },
+@@ -1578,6 +1581,9 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}
+ args[ac++] = "--ignore-case";
+
if (partial_dir && am_sender) {
- args[ac++] = "--partial-dir";
- args[ac++] = partial_dir;
---- orig/t_stub.c 2004-07-29 16:08:04
-+++ t_stub.c 2004-08-13 17:19:56
-@@ -28,6 +28,7 @@
-
- int modify_window = 0;
- int module_id = -1;
-+int ignore_case = 0;
- char *partial_dir;
- struct exclude_list_struct server_exclude_list;
-
---- orig/util.c 2004-09-07 21:45:30
-+++ util.c 2004-08-13 16:40:34
-@@ -31,6 +31,7 @@ extern int verbose;
- extern int dry_run;
- extern int module_id;
- extern int modify_window;
-+extern int ignore_case;
- extern char *partial_dir;
- extern struct exclude_list_struct server_exclude_list;
-
-@@ -1015,11 +1016,23 @@ int u_strcmp(const char *cs1, const char
- {
- const uchar *s1 = (const uchar *)cs1;
- const uchar *s2 = (const uchar *)cs2;
-+
-+ if (ignore_case) {
-+ uchar c1, c2;
-+ while (1) {
-+ c1 = islower(*s1) ? toupper(*s1) : *s1;
-+ c2 = islower(*s2) ? toupper(*s2) : *s2;
-+ if (!c1 || c1 != c2)
-+ break;
-+ s1++, s2++;
-+ }
-
-- while (*s1 && *s2 && (*s1 == *s2)) {
-- s1++; s2++;
-+ return (int)c1 - (int)c2;
- }
-
-+ while (*s1 && *s1 == *s2)
-+ s1++, s2++;
-+
- return (int)*s1 - (int)*s2;
- }
-
---- orig/wildtest.c 2004-02-07 18:40:52
-+++ wildtest.c 2004-08-13 17:19:34
+ if (partial_dir != partialdir_for_delayupdate) {
+ args[ac++] = "--partial-dir";
+--- orig/wildtest.c 2006-01-14 08:14:31
++++ wildtest.c 2006-01-20 20:13:46
@@ -16,6 +16,7 @@ int fnmatch_errors = 0;
#endif