1 This adds the --ignore-case option, which makes rsync compare filenames
2 in a case-insensitive manner.
4 --- orig/lib/wildmatch.c 2005-01-28 21:01:21
5 +++ lib/wildmatch.c 2004-08-13 16:43:27
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 @@ -76,9 +78,19 @@ static int domatch(const uchar *p, const
25 + if (ISUPPER(*text)) {
26 + if (tolower(*text) == ch)
29 + else if (ISUPPER(ch)) {
30 + if (*text == tolower(ch))
36 /* Match anything but '/'. */
38 --- orig/options.c 2005-09-29 18:06:38
39 +++ options.c 2005-09-29 18:08:37
40 @@ -101,6 +101,7 @@ int max_delete = 0;
42 int ignore_errors = 0;
43 int modify_window = 0;
46 int checksum_seed = 0;
48 @@ -332,6 +333,7 @@ void usage(enum logcode F)
49 rprintf(F," --include-from=FILE read include patterns from FILE\n");
50 rprintf(F," --files-from=FILE read list of source-file names from FILE\n");
51 rprintf(F," -0, --from0 all *-from/filter files are delimited by 0s\n");
52 + rprintf(F," --ignore-case ignore case when comparing filenames\n");
53 rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n");
54 rprintf(F," --port=PORT specify double-colon alternate port number\n");
55 rprintf(F," --blocking-io use blocking I/O for the remote shell\n");
56 @@ -418,6 +420,7 @@ static struct poptOption long_options[]
57 {"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
58 {"ignore-existing", 0, POPT_ARG_NONE, &ignore_existing, 0, 0, 0 },
59 {"ignore-non-existing",0,POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
60 + {"ignore-case", 0, POPT_ARG_NONE, &ignore_case, 0, 0, 0 },
61 {"max-size", 0, POPT_ARG_STRING, &max_size_arg, OPT_MAX_SIZE, 0, 0 },
62 {"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 },
63 {"inplace", 0, POPT_ARG_NONE, &inplace, 0, 0, 0 },
64 @@ -1477,6 +1480,9 @@ void server_options(char **args,int *arg
69 + args[ac++] = "--ignore-case";
71 if (partial_dir && am_sender) {
72 if (partial_dir != partialdir_for_delayupdate) {
73 args[ac++] = "--partial-dir";
74 --- orig/t_stub.c 2005-01-25 10:39:14
75 +++ t_stub.c 2004-08-13 17:19:56
78 int modify_window = 0;
82 struct filter_list_struct server_filter_list;
84 --- orig/util.c 2005-08-17 06:45:08
85 +++ util.c 2004-08-13 16:40:34
86 @@ -31,6 +31,7 @@ extern int verbose;
89 extern int modify_window;
90 +extern int ignore_case;
91 extern char *partial_dir;
92 extern struct filter_list_struct server_filter_list;
94 @@ -1039,11 +1040,23 @@ int u_strcmp(const char *cs1, const char
96 const uchar *s1 = (const uchar *)cs1;
97 const uchar *s2 = (const uchar *)cs2;
102 + c1 = islower(*s1) ? toupper(*s1) : *s1;
103 + c2 = islower(*s2) ? toupper(*s2) : *s2;
104 + if (!c1 || c1 != c2)
109 - while (*s1 && *s2 && (*s1 == *s2)) {
111 + return (int)c1 - (int)c2;
114 + while (*s1 && *s1 == *s2)
117 return (int)*s1 - (int)*s2;
120 --- orig/wildtest.c 2004-02-07 18:40:52
121 +++ wildtest.c 2004-08-13 17:19:34
122 @@ -16,6 +16,7 @@ int fnmatch_errors = 0;
125 int wildmatch_errors = 0;
126 +int ignore_case = 0;