Use "use warnings" rather than -w on the #! line.
[rsync/rsync-patches.git] / ignore-case.diff
CommitLineData
992633a5
WD
1This adds the --ignore-case option, which makes rsync compare filenames
2in a case-insensitive manner.
8a524ae0 3
03019e41
WD
4To use this patch, run these commands for a successful build:
5
6 patch -p1 <patches/ignore-case.diff
7 ./configure (optional if already run)
8 make
9
0f8eae47
WD
10TODO:
11
12 - Make this code handle multibyte character encodings, and honor the
13 --iconv setting when converting case.
14
cc3e685d
WD
15diff --git a/exclude.c b/exclude.c
16--- a/exclude.c
17+++ b/exclude.c
c82285d5
WD
18@@ -21,6 +21,7 @@
19 */
20
21 #include "rsync.h"
22+#include "ifuncs.h"
23
24 extern int verbose;
25 extern int am_server;
65ecbe35 26@@ -605,16 +606,15 @@ static int rule_matches(const char *fname, struct filter_struct *ex, int name_is
6100b16e
WD
27 if (litmatch_array(pattern, strings, slash_handling))
28 return ret_match;
29 } else if (anchored_match) {
30- if (strcmp(name, pattern) == 0)
5befb079 31+ if (ic_strEQ(name, pattern))
6100b16e
WD
32 return ret_match;
33 } else {
34 int l1 = strlen(name);
35 int l2 = strlen(pattern);
36- if (l2 <= l1 &&
37- strcmp(name+(l1-l2),pattern) == 0 &&
38- (l1==l2 || name[l1-(l2+1)] == '/')) {
39+ if (l2 <= l1
5befb079 40+ && ic_strEQ(name + (l1-l2), pattern)
6100b16e
WD
41+ && (l1 == l2 || name[l1 - (l2+1)] == '/'))
42 return ret_match;
43- }
44 }
45
46 return !ret_match;
cc3e685d
WD
47diff --git a/flist.c b/flist.c
48--- a/flist.c
49+++ b/flist.c
f80ebf7e 50@@ -35,6 +35,7 @@ extern int inc_recurse;
9c657c9f
WD
51 extern int do_progress;
52 extern int always_checksum;
53 extern int module_id;
54+extern int ignore_case;
55 extern int ignore_errors;
56 extern int numeric_ids;
57 extern int recurse;
bf1bd9d4 58@@ -2803,6 +2804,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
f80ebf7e
WD
59 {
60 int dif;
7bfcb297
WD
61 const uchar *c1, *c2;
62+ uchar ch1, ch2;
f80ebf7e
WD
63 enum fnc_state state1, state2;
64 enum fnc_type type1, type2;
65 enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
bf1bd9d4 66@@ -2913,7 +2915,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
3f053c45
WD
67 if (type1 != type2)
68 return type1 == t_PATH ? 1 : -1;
69 }
70- } while ((dif = (int)*c1++ - (int)*c2++) == 0);
5befb079
WD
71+ ch1 = *c1++;
72+ ch2 = *c2++;
9c657c9f 73+ if (ignore_case) {
5befb079
WD
74+ if (isupper(ch1))
75+ ch1 = tolower(ch1);
76+ if (isupper(ch2))
77+ ch2 = tolower(ch2);
f80ebf7e 78+ }
5befb079 79+ } while ((dif = (int)ch1 - (int)ch2) == 0);
3f053c45
WD
80
81 return dif;
82 }
cc3e685d
WD
83diff --git a/ifuncs.h b/ifuncs.h
84--- a/ifuncs.h
85+++ b/ifuncs.h
c0c7984e 86@@ -108,3 +108,38 @@ toUpper(const char *ptr)
5befb079
WD
87 {
88 return toupper(*(unsigned char *)ptr);
89 }
90+
91+static inline int
92+strEQ(const char *s1, const char *s2)
93+{
94+ return strcmp(s1, s2) == 0;
95+}
96+
97+static inline int
98+strnEQ(const char *s1, const char *s2, size_t n)
99+{
100+ return strncmp(s1, s2, n) == 0;
101+}
102+
103+static inline int
104+ic_strEQ(const char *s1, const char *s2)
105+{
106+ extern int ignore_case;
107+ if (ignore_case)
108+ return strcasecmp(s1, s2) == 0;
109+ return strcmp(s1, s2) == 0;
110+}
111+
112+static inline int
113+ic_strnEQ(const char *s1, const char *s2, size_t n)
114+{
115+ extern int ignore_case;
116+ if (ignore_case)
c82285d5
WD
117+ return strncasecmp(s1, s2, n) == 0;
118+ return strncmp(s1, s2, n) == 0;
5befb079
WD
119+}
120+
121+#define strNE(s1,s2) (!strEQ(s1,s2))
122+#define strnNE(s1,s2,n) (!strnEQ(s1,s2,n))
123+#define ic_strNE(s1,s2) (!ic_strEQ(s1,s2))
124+#define ic_strnNE(s1,s2) (!ic_strnEQ(s1,s2,n))
cc3e685d
WD
125diff --git a/lib/wildmatch.c b/lib/wildmatch.c
126--- a/lib/wildmatch.c
127+++ b/lib/wildmatch.c
992633a5
WD
128@@ -53,6 +53,8 @@
129 #define ISUPPER(c) (ISASCII(c) && isupper(c))
130 #define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
131
132+extern int ignore_case;
133+
134 #ifdef WILD_TEST_ITERATIONS
135 int wildmatch_iteration_count;
136 #endif
cc3e685d 137@@ -72,6 +74,8 @@ static int dowild(const uchar *p, const uchar *text, const uchar*const *a)
ffadcb36
WD
138 for ( ; (p_ch = *p) != '\0'; text++, p++) {
139 int matched, special;
140 uchar t_ch, prev_ch;
141+ if (ignore_case && ISUPPER(p_ch))
142+ p_ch = tolower(p_ch);
66e2df0e
WD
143 while ((t_ch = *text) == '\0') {
144 if (*a == NULL) {
145 if (p_ch != '*')
cc3e685d 146@@ -237,12 +241,21 @@ static int dowild(const uchar *p, const uchar *text, const uchar*const *a)
6100b16e
WD
147 * of "text" and any strings in array "a". */
148 static int doliteral(const uchar *s, const uchar *text, const uchar*const *a)
149 {
150+ uchar s_ch, t_ch;
151 for ( ; *s != '\0'; text++, s++) {
152 while (*text == '\0') {
153 if ((text = *a++) == NULL)
154 return FALSE;
155 }
156- if (*text != *s)
157+ s_ch = *s;
158+ t_ch = *text;
159+ if (ignore_case) {
160+ if (ISUPPER(s_ch))
161+ s_ch = tolower(s_ch);
162+ if (ISUPPER(t_ch))
163+ t_ch = tolower(t_ch);
164+ }
165+ if (t_ch != s_ch)
166 return FALSE;
167 }
168
cc3e685d 169@@ -288,10 +301,14 @@ static const uchar *trailing_N_elements(const uchar*const **a_ptr, int count)
ffadcb36
WD
170 int wildmatch(const char *pattern, const char *text)
171 {
66e2df0e 172 static const uchar *nomore[1]; /* A NULL pointer. */
ffadcb36
WD
173+ int ret;
174 #ifdef WILD_TEST_ITERATIONS
175 wildmatch_iteration_count = 0;
176 #endif
66e2df0e 177- return dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
ffadcb36 178+ force_lower_case = ignore_case;
66e2df0e 179+ ret = dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
ffadcb36 180+ force_lower_case = 0;
66e2df0e 181+ return ret;
ffadcb36
WD
182 }
183
184 /* Match the "pattern" against the forced-to-lower-case "text" string. */
cc3e685d 185@@ -331,12 +348,14 @@ int wildmatch_array(const char *pattern, const char*const *texts, int where)
c05e712e
WD
186 if (!text)
187 return FALSE;
188
189+ force_lower_case = ignore_case;
190+
191 if ((matched = dowild(p, text, a)) != TRUE && where < 0
192 && matched != ABORT_ALL) {
193 while (1) {
194 if (*text == '\0') {
195 if ((text = (uchar*)*a++) == NULL)
196- return FALSE;
197+ break;
198 continue;
199 }
200 if (*text++ == '/' && (matched = dowild(p, text, a)) != FALSE
cc3e685d 201@@ -344,6 +363,9 @@ int wildmatch_array(const char *pattern, const char*const *texts, int where)
c05e712e
WD
202 break;
203 }
204 }
205+
206+ force_lower_case = 0;
207+
208 return matched == TRUE;
209 }
210
cc3e685d
WD
211diff --git a/options.c b/options.c
212--- a/options.c
213+++ b/options.c
c0c7984e 214@@ -118,6 +118,7 @@ OFF_T max_size = 0;
56208f7b 215 OFF_T min_size = 0;
5f7bb027
WD
216 int ignore_errors = 0;
217 int modify_window = 0;
218+int ignore_case = 0;
219 int blocking_io = -1;
220 int checksum_seed = 0;
f6c3b300 221 int inplace = 0;
abd3adb8 222@@ -409,6 +410,7 @@ void usage(enum logcode F)
a7219d20 223 rprintf(F," --files-from=FILE read list of source-file names from FILE\n");
896871f8 224 rprintf(F," -0, --from0 all *-from/filter files are delimited by 0s\n");
790ba11a 225 rprintf(F," -s, --protect-args no space-splitting; only wildcard special-chars\n");
5befb079
WD
226+ rprintf(F," --ignore-case ignore case when comparing filenames\n");
227 rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n");
228 rprintf(F," --port=PORT specify double-colon alternate port number\n");
229 rprintf(F," --sockopts=OPTIONS specify custom TCP options\n");
abd3adb8 230@@ -615,6 +617,8 @@ static struct poptOption long_options[] = {
6cbbe66d
WD
231 {"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
232 {"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
edea1111 233 {"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
2c20ee4e
WD
234+ {"ignore-case", 0, POPT_ARG_VAL, &ignore_case, 1, 0, 0 },
235+ {"no-ignore-case", 0, POPT_ARG_VAL, &ignore_case, 0, 0, 0 },
6cbbe66d
WD
236 {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
237 {"from0", '0', POPT_ARG_VAL, &eol_nulls, 1, 0, 0},
238 {"no-from0", 0, POPT_ARG_VAL, &eol_nulls, 0, 0, 0},
abd3adb8 239@@ -1981,6 +1985,9 @@ void server_options(char **args, int *argc_p)
5f7bb027
WD
240 args[ac++] = arg;
241 }
7628f156 242
5f7bb027
WD
243+ if (ignore_case)
244+ args[ac++] = "--ignore-case";
7628f156 245+
afbebe13 246 if (partial_dir && am_sender) {
9a7eef96 247 if (partial_dir != tmp_partialdir) {
27a7053c 248 args[ac++] = "--partial-dir";
cc3e685d
WD
249diff --git a/rsync.yo b/rsync.yo
250--- a/rsync.yo
251+++ b/rsync.yo
abd3adb8 252@@ -406,6 +406,7 @@ to the detailed description below for a complete description. verb(
5befb079
WD
253 --files-from=FILE read list of source-file names from FILE
254 -0, --from0 all *from/filter files are delimited by 0s
255 -s, --protect-args no space-splitting; wildcard chars only
256+ --ignore-case ignore case when comparing filenames
257 --address=ADDRESS bind address for outgoing socket to daemon
258 --port=PORT specify double-colon alternate port number
259 --sockopts=OPTIONS specify custom TCP options
abd3adb8 260@@ -1449,6 +1450,10 @@ If you use this option with bf(--iconv), the args will also be translated
85096e5e 261 from the local to the remote character-set. The translation happens before
5befb079
WD
262 wild-cards are expanded. See also the bf(--files-from) option.
263
264+dit(bf(--ignore-case)) This option tells rsync to ignore upper-/lower-case
265+differences when comparing filenames. This can avoid problems when sending
266+files to a filesystem that ignores these differences.
267+
268 dit(bf(-T, --temp-dir=DIR)) This option instructs rsync to use DIR as a
269 scratch directory when creating temporary copies of the files transferred
270 on the receiving side. The default behavior is to create each temporary
cc3e685d
WD
271diff --git a/wildtest.c b/wildtest.c
272--- a/wildtest.c
273+++ b/wildtest.c
6100b16e 274@@ -31,6 +31,7 @@ int fnmatch_errors = 0;
992633a5
WD
275 #endif
276
277 int wildmatch_errors = 0;
278+int ignore_case = 0;
279
280 typedef char bool;
5f7bb027 281