1 This adds the --ignore-case option, which makes rsync compare filenames
2 in a case-insensitive manner.
4 To use this patch, run these commands for a successful build:
6 patch -p1 <patches/ignore-case.diff
7 ./configure (optional if already run)
12 @@ -32,6 +32,7 @@ extern int am_sender;
13 extern int do_progress;
14 extern int always_checksum;
16 +extern int ignore_case;
17 extern int ignore_errors;
18 extern int numeric_ids;
20 @@ -1783,7 +1784,7 @@ int f_name_cmp(struct file_struct *f1, s
22 return type1 == t_PATH ? 1 : -1;
29 @@ -1846,7 +1847,16 @@ int f_name_cmp(struct file_struct *f1, s
31 return type1 == t_PATH ? 1 : -1;
33 - } while ((dif = (int)*c1++ - (int)*c2++) == 0);
36 + ch1 = islower(*c1) ? toupper(*c1) : *c1;
37 + ch2 = islower(*c2) ? toupper(*c2) : *c2;
39 + if ((dif = (int)ch1 - (int)ch2) != 0)
41 + } else if ((dif = (int)*c1++ - (int)*c2++) != 0)
47 --- old/lib/wildmatch.c
48 +++ new/lib/wildmatch.c
50 #define ISUPPER(c) (ISASCII(c) && isupper(c))
51 #define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
53 +extern int ignore_case;
55 #ifdef WILD_TEST_ITERATIONS
56 int wildmatch_iteration_count;
58 @@ -72,6 +74,8 @@ static int dowild(const uchar *p, const
59 for ( ; (p_ch = *p) != '\0'; text++, p++) {
62 + if (ignore_case && ISUPPER(p_ch))
63 + p_ch = tolower(p_ch);
64 while ((t_ch = *text) == '\0') {
67 @@ -288,10 +292,14 @@ static const uchar *trailing_N_elements(
68 int wildmatch(const char *pattern, const char *text)
70 static const uchar *nomore[1]; /* A NULL pointer. */
72 #ifdef WILD_TEST_ITERATIONS
73 wildmatch_iteration_count = 0;
75 - return dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
76 + force_lower_case = ignore_case;
77 + ret = dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
78 + force_lower_case = 0;
82 /* Match the "pattern" against the forced-to-lower-case "text" string. */
85 @@ -111,6 +111,7 @@ OFF_T max_size = 0;
87 int ignore_errors = 0;
88 int modify_window = 0;
91 int checksum_seed = 0;
93 @@ -361,6 +362,7 @@ void usage(enum logcode F)
94 rprintf(F," --include-from=FILE read include patterns from FILE\n");
95 rprintf(F," --files-from=FILE read list of source-file names from FILE\n");
96 rprintf(F," -0, --from0 all *-from/filter files are delimited by 0s\n");
97 + rprintf(F," --ignore-case ignore case when comparing filenames\n");
98 rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n");
99 rprintf(F," --port=PORT specify double-colon alternate port number\n");
100 rprintf(F," --sockopts=OPTIONS specify custom TCP options\n");
101 @@ -525,6 +527,7 @@ static struct poptOption long_options[]
102 {"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
103 {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
104 {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
105 + {"ignore-case", 0, POPT_ARG_NONE, &ignore_case, 0, 0, 0 },
106 {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
107 {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
108 {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
109 @@ -1688,6 +1691,9 @@ void server_options(char **args,int *arg
114 + args[ac++] = "--ignore-case";
116 if (partial_dir && am_sender) {
117 if (partial_dir != tmp_partialdir) {
118 args[ac++] = "--partial-dir";
121 @@ -32,6 +32,7 @@ int fnmatch_errors = 0;
124 int wildmatch_errors = 0;
125 +int ignore_case = 0;