Commit | Line | Data |
---|---|---|
992633a5 WD |
1 | This adds the --ignore-case option, which makes rsync compare filenames |
2 | in a case-insensitive manner. | |
8a524ae0 | 3 | |
03019e41 WD |
4 | To 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 | ||
9a7eef96 WD |
10 | --- old/flist.c |
11 | +++ new/flist.c | |
f2376a08 | 12 | @@ -34,6 +34,7 @@ extern int incremental; |
9c657c9f WD |
13 | extern int do_progress; |
14 | extern int always_checksum; | |
15 | extern int module_id; | |
16 | +extern int ignore_case; | |
17 | extern int ignore_errors; | |
18 | extern int numeric_ids; | |
19 | extern int recurse; | |
f2376a08 | 20 | @@ -2161,7 +2162,7 @@ int f_name_cmp(struct file_struct *f1, s |
3f053c45 | 21 | if (type1 != type2) |
9c657c9f WD |
22 | return type1 == t_PATH ? 1 : -1; |
23 | ||
3f053c45 WD |
24 | - do { |
25 | + while (1) { | |
26 | if (!*c1) { | |
27 | switch (state1) { | |
28 | case s_DIR: | |
f2376a08 | 29 | @@ -2224,7 +2225,16 @@ int f_name_cmp(struct file_struct *f1, s |
3f053c45 WD |
30 | if (type1 != type2) |
31 | return type1 == t_PATH ? 1 : -1; | |
32 | } | |
33 | - } while ((dif = (int)*c1++ - (int)*c2++) == 0); | |
9c657c9f WD |
34 | + if (ignore_case) { |
35 | + uchar ch1, ch2; | |
36 | + ch1 = islower(*c1) ? toupper(*c1) : *c1; | |
37 | + ch2 = islower(*c2) ? toupper(*c2) : *c2; | |
38 | + c1++, c2++; | |
39 | + if ((dif = (int)ch1 - (int)ch2) != 0) | |
40 | + break; | |
41 | + } else if ((dif = (int)*c1++ - (int)*c2++) != 0) | |
3f053c45 WD |
42 | + break; |
43 | + } | |
44 | ||
45 | return dif; | |
46 | } | |
9a7eef96 WD |
47 | --- old/lib/wildmatch.c |
48 | +++ new/lib/wildmatch.c | |
992633a5 WD |
49 | @@ -53,6 +53,8 @@ |
50 | #define ISUPPER(c) (ISASCII(c) && isupper(c)) | |
51 | #define ISXDIGIT(c) (ISASCII(c) && isxdigit(c)) | |
52 | ||
53 | +extern int ignore_case; | |
54 | + | |
55 | #ifdef WILD_TEST_ITERATIONS | |
56 | int wildmatch_iteration_count; | |
57 | #endif | |
66e2df0e | 58 | @@ -72,6 +74,8 @@ static int dowild(const uchar *p, const |
ffadcb36 WD |
59 | for ( ; (p_ch = *p) != '\0'; text++, p++) { |
60 | int matched, special; | |
61 | uchar t_ch, prev_ch; | |
62 | + if (ignore_case && ISUPPER(p_ch)) | |
63 | + p_ch = tolower(p_ch); | |
66e2df0e WD |
64 | while ((t_ch = *text) == '\0') { |
65 | if (*a == NULL) { | |
66 | if (p_ch != '*') | |
67 | @@ -288,10 +292,14 @@ static const uchar *trailing_N_elements( | |
ffadcb36 WD |
68 | int wildmatch(const char *pattern, const char *text) |
69 | { | |
66e2df0e | 70 | static const uchar *nomore[1]; /* A NULL pointer. */ |
ffadcb36 WD |
71 | + int ret; |
72 | #ifdef WILD_TEST_ITERATIONS | |
73 | wildmatch_iteration_count = 0; | |
74 | #endif | |
66e2df0e | 75 | - return dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE; |
ffadcb36 | 76 | + force_lower_case = ignore_case; |
66e2df0e | 77 | + ret = dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE; |
ffadcb36 | 78 | + force_lower_case = 0; |
66e2df0e | 79 | + return ret; |
ffadcb36 WD |
80 | } |
81 | ||
82 | /* Match the "pattern" against the forced-to-lower-case "text" string. */ | |
9a7eef96 WD |
83 | --- old/options.c |
84 | +++ new/options.c | |
afcb578c | 85 | @@ -111,6 +111,7 @@ OFF_T max_size = 0; |
56208f7b | 86 | OFF_T min_size = 0; |
5f7bb027 WD |
87 | int ignore_errors = 0; |
88 | int modify_window = 0; | |
89 | +int ignore_case = 0; | |
90 | int blocking_io = -1; | |
91 | int checksum_seed = 0; | |
f6c3b300 | 92 | int inplace = 0; |
f2376a08 | 93 | @@ -358,6 +359,7 @@ void usage(enum logcode F) |
a7219d20 WD |
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"); | |
896871f8 | 96 | rprintf(F," -0, --from0 all *-from/filter files are delimited by 0s\n"); |
5f7bb027 | 97 | + rprintf(F," --ignore-case ignore case when comparing filenames\n"); |
2b06a19d | 98 | rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n"); |
37da98ae | 99 | rprintf(F," --port=PORT specify double-colon alternate port number\n"); |
9a7eef96 | 100 | rprintf(F," --sockopts=OPTIONS specify custom TCP options\n"); |
f2376a08 | 101 | @@ -523,6 +525,7 @@ static struct poptOption long_options[] |
edea1111 WD |
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}, | |
5f7bb027 | 105 | + {"ignore-case", 0, POPT_ARG_NONE, &ignore_case, 0, 0, 0 }, |
edea1111 WD |
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 }, | |
f2376a08 | 109 | @@ -1704,6 +1707,9 @@ void server_options(char **args,int *arg |
5f7bb027 WD |
110 | args[ac++] = arg; |
111 | } | |
7628f156 | 112 | |
5f7bb027 WD |
113 | + if (ignore_case) |
114 | + args[ac++] = "--ignore-case"; | |
7628f156 | 115 | + |
afbebe13 | 116 | if (partial_dir && am_sender) { |
9a7eef96 | 117 | if (partial_dir != tmp_partialdir) { |
27a7053c | 118 | args[ac++] = "--partial-dir"; |
9a7eef96 WD |
119 | --- old/wildtest.c |
120 | +++ new/wildtest.c | |
3f053c45 | 121 | @@ -32,6 +32,7 @@ int fnmatch_errors = 0; |
992633a5 WD |
122 | #endif |
123 | ||
124 | int wildmatch_errors = 0; | |
125 | +int ignore_case = 0; | |
126 | ||
127 | typedef char bool; | |
5f7bb027 | 128 |