1 This adds the --ignore-case option, which makes rsync compare filenames
2 in a case-insensitive manner.
4 --- orig/lib/wildmatch.c 2003-07-14 15:12:59
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 unsigned char *
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-01-01 21:11:00
39 +++ options.c 2004-10-14 17:22:51
40 @@ -94,6 +94,7 @@ int max_delete = 0;
42 int ignore_errors = 0;
43 int modify_window = 0;
46 int checksum_seed = 0;
48 @@ -297,6 +298,7 @@ void usage(enum logcode F)
49 rprintf(F," --include-from=FILE don't exclude patterns listed in FILE\n");
50 rprintf(F," --files-from=FILE read FILE for list of source-file names\n");
51 rprintf(F," -0, --from0 all *-from file lists are delimited by nulls\n");
52 + rprintf(F," --ignore-case ignore case when comparing filenames\n");
53 rprintf(F," --version print version number\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 @@ -347,6 +349,7 @@ static struct poptOption long_options[]
57 {"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 },
58 {"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 },
59 {"include-from", 0, POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 0 },
60 + {"ignore-case", 0, POPT_ARG_NONE, &ignore_case, 0, 0, 0 },
61 {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 },
62 {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 },
63 {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 },
64 @@ -1182,6 +1185,9 @@ void server_options(char **args,int *arg
69 + args[ac++] = "--ignore-case";
71 if (partial_dir && am_sender) {
72 args[ac++] = "--partial-dir";
73 args[ac++] = partial_dir;
74 --- orig/t_stub.c 2004-07-29 16:08:04
75 +++ t_stub.c 2004-08-13 17:19:56
78 int modify_window = 0;
82 struct exclude_list_struct server_exclude_list;
84 --- orig/util.c 2004-09-07 21:45:30
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 exclude_list_struct server_exclude_list;
94 @@ -1015,11 +1016,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;