| 1 | This adds the --ignore-case option, which makes rsync compare filenames |
| 2 | in a case-insensitive manner. |
| 3 | |
| 4 | --- old/flist.c |
| 5 | +++ new/flist.c |
| 6 | @@ -37,6 +37,7 @@ extern int am_sender; |
| 7 | extern int do_progress; |
| 8 | extern int always_checksum; |
| 9 | extern int module_id; |
| 10 | +extern int ignore_case; |
| 11 | extern int ignore_errors; |
| 12 | extern int numeric_ids; |
| 13 | extern int recurse; |
| 14 | @@ -1801,7 +1802,14 @@ int f_name_cmp(struct file_struct *f1, s |
| 15 | return type1 == t_PATH ? 1 : -1; |
| 16 | |
| 17 | while (1) { |
| 18 | - if ((dif = (int)*c1++ - (int)*c2++) != 0) |
| 19 | + if (ignore_case) { |
| 20 | + uchar ch1, ch2; |
| 21 | + ch1 = islower(*c1) ? toupper(*c1) : *c1; |
| 22 | + ch2 = islower(*c2) ? toupper(*c2) : *c2; |
| 23 | + c1++, c2++; |
| 24 | + if ((dif = (int)ch1 - (int)ch2) != 0) |
| 25 | + break; |
| 26 | + } else if ((dif = (int)*c1++ - (int)*c2++) != 0) |
| 27 | break; |
| 28 | if (!*c1) { |
| 29 | switch (state1) { |
| 30 | --- old/lib/wildmatch.c |
| 31 | +++ new/lib/wildmatch.c |
| 32 | @@ -53,6 +53,8 @@ |
| 33 | #define ISUPPER(c) (ISASCII(c) && isupper(c)) |
| 34 | #define ISXDIGIT(c) (ISASCII(c) && isxdigit(c)) |
| 35 | |
| 36 | +extern int ignore_case; |
| 37 | + |
| 38 | #ifdef WILD_TEST_ITERATIONS |
| 39 | int wildmatch_iteration_count; |
| 40 | #endif |
| 41 | @@ -72,6 +74,8 @@ static int dowild(const uchar *p, const |
| 42 | for ( ; (p_ch = *p) != '\0'; text++, p++) { |
| 43 | int matched, special; |
| 44 | uchar t_ch, prev_ch; |
| 45 | + if (ignore_case && ISUPPER(p_ch)) |
| 46 | + p_ch = tolower(p_ch); |
| 47 | while ((t_ch = *text) == '\0') { |
| 48 | if (*a == NULL) { |
| 49 | if (p_ch != '*') |
| 50 | @@ -288,10 +292,14 @@ static const uchar *trailing_N_elements( |
| 51 | int wildmatch(const char *pattern, const char *text) |
| 52 | { |
| 53 | static const uchar *nomore[1]; /* A NULL pointer. */ |
| 54 | + int ret; |
| 55 | #ifdef WILD_TEST_ITERATIONS |
| 56 | wildmatch_iteration_count = 0; |
| 57 | #endif |
| 58 | - return dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE; |
| 59 | + force_lower_case = ignore_case; |
| 60 | + ret = dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE; |
| 61 | + force_lower_case = 0; |
| 62 | + return ret; |
| 63 | } |
| 64 | |
| 65 | /* Match the "pattern" against the forced-to-lower-case "text" string. */ |
| 66 | --- old/options.c |
| 67 | +++ new/options.c |
| 68 | @@ -111,6 +111,7 @@ OFF_T max_size = 0; |
| 69 | OFF_T min_size = 0; |
| 70 | int ignore_errors = 0; |
| 71 | int modify_window = 0; |
| 72 | +int ignore_case = 0; |
| 73 | int blocking_io = -1; |
| 74 | int checksum_seed = 0; |
| 75 | int inplace = 0; |
| 76 | @@ -350,6 +351,7 @@ void usage(enum logcode F) |
| 77 | rprintf(F," --include-from=FILE read include patterns from FILE\n"); |
| 78 | rprintf(F," --files-from=FILE read list of source-file names from FILE\n"); |
| 79 | rprintf(F," -0, --from0 all *-from/filter files are delimited by 0s\n"); |
| 80 | + rprintf(F," --ignore-case ignore case when comparing filenames\n"); |
| 81 | rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n"); |
| 82 | rprintf(F," --port=PORT specify double-colon alternate port number\n"); |
| 83 | rprintf(F," --sockopts=OPTIONS specify custom TCP options\n"); |
| 84 | @@ -503,6 +505,7 @@ static struct poptOption long_options[] |
| 85 | {"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 }, |
| 86 | {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 }, |
| 87 | {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0}, |
| 88 | + {"ignore-case", 0, POPT_ARG_NONE, &ignore_case, 0, 0, 0 }, |
| 89 | {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 }, |
| 90 | {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 }, |
| 91 | {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 }, |
| 92 | @@ -1657,6 +1660,9 @@ void server_options(char **args,int *arg |
| 93 | args[ac++] = arg; |
| 94 | } |
| 95 | |
| 96 | + if (ignore_case) |
| 97 | + args[ac++] = "--ignore-case"; |
| 98 | + |
| 99 | if (partial_dir && am_sender) { |
| 100 | if (partial_dir != tmp_partialdir) { |
| 101 | args[ac++] = "--partial-dir"; |
| 102 | --- old/wildtest.c |
| 103 | +++ new/wildtest.c |
| 104 | @@ -16,6 +16,7 @@ int fnmatch_errors = 0; |
| 105 | #endif |
| 106 | |
| 107 | int wildmatch_errors = 0; |
| 108 | +int ignore_case = 0; |
| 109 | |
| 110 | typedef char bool; |
| 111 | |