1 This adds the --ignore-case option, which makes rsync compare filenames
2 in a case-insensitive manner.
6 @@ -32,6 +32,7 @@ extern int am_sender;
7 extern int do_progress;
8 extern int always_checksum;
10 +extern int ignore_case;
11 extern int ignore_errors;
12 extern int numeric_ids;
14 @@ -1786,7 +1787,7 @@ int f_name_cmp(struct file_struct *f1, s
16 return type1 == t_PATH ? 1 : -1;
23 @@ -1849,7 +1850,16 @@ int f_name_cmp(struct file_struct *f1, s
25 return type1 == t_PATH ? 1 : -1;
27 - } while ((dif = (int)*c1++ - (int)*c2++) == 0);
30 + ch1 = islower(*c1) ? toupper(*c1) : *c1;
31 + ch2 = islower(*c2) ? toupper(*c2) : *c2;
33 + if ((dif = (int)ch1 - (int)ch2) != 0)
35 + } else if ((dif = (int)*c1++ - (int)*c2++) != 0)
41 --- old/lib/wildmatch.c
42 +++ new/lib/wildmatch.c
44 #define ISUPPER(c) (ISASCII(c) && isupper(c))
45 #define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
47 +extern int ignore_case;
49 #ifdef WILD_TEST_ITERATIONS
50 int wildmatch_iteration_count;
52 @@ -72,6 +74,8 @@ static int dowild(const uchar *p, const
53 for ( ; (p_ch = *p) != '\0'; text++, p++) {
56 + if (ignore_case && ISUPPER(p_ch))
57 + p_ch = tolower(p_ch);
58 while ((t_ch = *text) == '\0') {
61 @@ -288,10 +292,14 @@ static const uchar *trailing_N_elements(
62 int wildmatch(const char *pattern, const char *text)
64 static const uchar *nomore[1]; /* A NULL pointer. */
66 #ifdef WILD_TEST_ITERATIONS
67 wildmatch_iteration_count = 0;
69 - return dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
70 + force_lower_case = ignore_case;
71 + ret = dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
72 + force_lower_case = 0;
76 /* Match the "pattern" against the forced-to-lower-case "text" string. */
79 @@ -111,6 +111,7 @@ OFF_T max_size = 0;
81 int ignore_errors = 0;
82 int modify_window = 0;
85 int checksum_seed = 0;
87 @@ -359,6 +360,7 @@ void usage(enum logcode F)
88 rprintf(F," --include-from=FILE read include patterns from FILE\n");
89 rprintf(F," --files-from=FILE read list of source-file names from FILE\n");
90 rprintf(F," -0, --from0 all *-from/filter files are delimited by 0s\n");
91 + rprintf(F," --ignore-case ignore case when comparing filenames\n");
92 rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n");
93 rprintf(F," --port=PORT specify double-colon alternate port number\n");
94 rprintf(F," --sockopts=OPTIONS specify custom TCP options\n");
95 @@ -521,6 +523,7 @@ static struct poptOption long_options[]
96 {"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
97 {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
98 {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
99 + {"ignore-case", 0, POPT_ARG_NONE, &ignore_case, 0, 0, 0 },
100 {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
101 {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
102 {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
103 @@ -1684,6 +1687,9 @@ void server_options(char **args,int *arg
108 + args[ac++] = "--ignore-case";
110 if (partial_dir && am_sender) {
111 if (partial_dir != tmp_partialdir) {
112 args[ac++] = "--partial-dir";
115 @@ -32,6 +32,7 @@ int fnmatch_errors = 0;
118 int wildmatch_errors = 0;
119 +int ignore_case = 0;