1 This adds the --ignore-case option, which makes rsync compare filenames
2 in a case-insensitive manner.
4 --- orig/lib/wildmatch.c 2006-01-03 17:26:02
5 +++ lib/wildmatch.c 2006-01-03 17:29:11
7 #define ISUPPER(c) (ISASCII(c) && isupper(c))
8 #define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
10 +extern int ignore_case;
12 #ifdef WILD_TEST_ITERATIONS
13 int wildmatch_iteration_count;
15 @@ -72,6 +74,8 @@ static int dowild(const uchar *p, const
16 for ( ; (p_ch = *p) != '\0'; text++, p++) {
19 + if (ignore_case && ISUPPER(p_ch))
20 + p_ch = tolower(p_ch);
21 while ((t_ch = *text) == '\0') {
24 @@ -288,10 +292,14 @@ static const uchar *trailing_N_elements(
25 int wildmatch(const char *pattern, const char *text)
27 static const uchar *nomore[1]; /* A NULL pointer. */
29 #ifdef WILD_TEST_ITERATIONS
30 wildmatch_iteration_count = 0;
32 - return dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
33 + force_lower_case = ignore_case;
34 + ret = dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
35 + force_lower_case = 0;
39 /* Match the "pattern" against the forced-to-lower-case "text" string. */
40 --- orig/options.c 2005-12-24 07:49:26
41 +++ options.c 2005-10-14 19:19:18
42 @@ -105,6 +105,7 @@ OFF_T max_size = 0;
44 int ignore_errors = 0;
45 int modify_window = 0;
48 int checksum_seed = 0;
50 @@ -342,6 +343,7 @@ void usage(enum logcode F)
51 rprintf(F," --include-from=FILE read include patterns from FILE\n");
52 rprintf(F," --files-from=FILE read list of source-file names from FILE\n");
53 rprintf(F," -0, --from0 all *-from/filter files are delimited by 0s\n");
54 + rprintf(F," --ignore-case ignore case when comparing filenames\n");
55 rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n");
56 rprintf(F," --port=PORT specify double-colon alternate port number\n");
57 rprintf(F," --blocking-io use blocking I/O for the remote shell\n");
58 @@ -485,6 +487,7 @@ static struct poptOption long_options[]
59 {"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
60 {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
61 {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
62 + {"ignore-case", 0, POPT_ARG_NONE, &ignore_case, 0, 0, 0 },
63 {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
64 {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
65 {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
66 @@ -1575,6 +1578,9 @@ void server_options(char **args,int *arg
71 + args[ac++] = "--ignore-case";
73 if (partial_dir && am_sender) {
74 if (partial_dir != partialdir_for_delayupdate) {
75 args[ac++] = "--partial-dir";
76 --- orig/t_stub.c 2005-11-12 20:13:05
77 +++ t_stub.c 2005-11-12 20:14:28
81 int modify_window = 0;
84 int relative_paths = 0;
85 int human_readable = 0;
86 --- orig/util.c 2005-11-12 20:13:05
87 +++ util.c 2005-11-12 20:14:39
92 +extern int ignore_case;
93 extern int modify_window;
94 extern int relative_paths;
95 extern int human_readable;
96 @@ -1045,11 +1046,23 @@ int u_strcmp(const char *cs1, const char
98 const uchar *s1 = (const uchar *)cs1;
99 const uchar *s2 = (const uchar *)cs2;
104 + c1 = islower(*s1) ? toupper(*s1) : *s1;
105 + c2 = islower(*s2) ? toupper(*s2) : *s2;
106 + if (!c1 || c1 != c2)
111 - while (*s1 && *s2 && (*s1 == *s2)) {
113 + return (int)c1 - (int)c2;
116 + while (*s1 && *s1 == *s2)
119 return (int)*s1 - (int)*s2;
122 --- orig/wildtest.c 2006-01-03 17:26:02
123 +++ wildtest.c 2004-08-13 17:19:34
124 @@ -16,6 +16,7 @@ int fnmatch_errors = 0;
127 int wildmatch_errors = 0;
128 +int ignore_case = 0;