This adds the --ignore-case option, which makes rsync compare filenames
in a case-insensitive manner.
---- orig/lib/wildmatch.c 2005-12-30 07:31:41
-+++ lib/wildmatch.c 2005-12-30 07:38:42
+To use this patch, run these commands for a successful build:
+
+ patch -p1 <patches/ignore-case.diff
+ ./configure (optional if already run)
+ make
+
+TODO:
+
+ - Make this code handle multibyte character encodings, and honor the
+ --iconv setting when converting case.
+
+diff --git a/exclude.c b/exclude.c
+--- a/exclude.c
++++ b/exclude.c
+@@ -21,6 +21,7 @@
+ */
+
+ #include "rsync.h"
++#include "ifuncs.h"
+
+ extern int verbose;
+ extern int am_server;
+@@ -580,16 +581,15 @@ static int rule_matches(char *fname, struct filter_struct *ex, int name_is_dir)
+ if (litmatch_array(pattern, strings, slash_handling))
+ return ret_match;
+ } else if (anchored_match) {
+- if (strcmp(name, pattern) == 0)
++ if (ic_strEQ(name, pattern))
+ return ret_match;
+ } else {
+ int l1 = strlen(name);
+ int l2 = strlen(pattern);
+- if (l2 <= l1 &&
+- strcmp(name+(l1-l2),pattern) == 0 &&
+- (l1==l2 || name[l1-(l2+1)] == '/')) {
++ if (l2 <= l1
++ && ic_strEQ(name + (l1-l2), pattern)
++ && (l1 == l2 || name[l1 - (l2+1)] == '/'))
+ return ret_match;
+- }
+ }
+
+ return !ret_match;
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/flist.c
+@@ -35,6 +35,7 @@ extern int inc_recurse;
+ extern int do_progress;
+ extern int always_checksum;
+ extern int module_id;
++extern int ignore_case;
+ extern int ignore_errors;
+ extern int numeric_ids;
+ extern int recurse;
+@@ -2619,6 +2620,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+ {
+ int dif;
+ const uchar *c1, *c2;
++ uchar ch1, ch2;
+ enum fnc_state state1, state2;
+ enum fnc_type type1, type2;
+ enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
+@@ -2729,7 +2731,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+ if (type1 != type2)
+ return type1 == t_PATH ? 1 : -1;
+ }
+- } while ((dif = (int)*c1++ - (int)*c2++) == 0);
++ ch1 = *c1++;
++ ch2 = *c2++;
++ if (ignore_case) {
++ if (isupper(ch1))
++ ch1 = tolower(ch1);
++ if (isupper(ch2))
++ ch2 = tolower(ch2);
++ }
++ } while ((dif = (int)ch1 - (int)ch2) == 0);
+
+ return dif;
+ }
+diff --git a/ifuncs.h b/ifuncs.h
+--- a/ifuncs.h
++++ b/ifuncs.h
+@@ -98,3 +98,38 @@ toUpper(const char *ptr)
+ {
+ return toupper(*(unsigned char *)ptr);
+ }
++
++static inline int
++strEQ(const char *s1, const char *s2)
++{
++ return strcmp(s1, s2) == 0;
++}
++
++static inline int
++strnEQ(const char *s1, const char *s2, size_t n)
++{
++ return strncmp(s1, s2, n) == 0;
++}
++
++static inline int
++ic_strEQ(const char *s1, const char *s2)
++{
++ extern int ignore_case;
++ if (ignore_case)
++ return strcasecmp(s1, s2) == 0;
++ return strcmp(s1, s2) == 0;
++}
++
++static inline int
++ic_strnEQ(const char *s1, const char *s2, size_t n)
++{
++ extern int ignore_case;
++ if (ignore_case)
++ return strncasecmp(s1, s2, n) == 0;
++ return strncmp(s1, s2, n) == 0;
++}
++
++#define strNE(s1,s2) (!strEQ(s1,s2))
++#define strnNE(s1,s2,n) (!strnEQ(s1,s2,n))
++#define ic_strNE(s1,s2) (!ic_strEQ(s1,s2))
++#define ic_strnNE(s1,s2) (!ic_strnEQ(s1,s2,n))
+diff --git a/lib/wildmatch.c b/lib/wildmatch.c
+--- a/lib/wildmatch.c
++++ b/lib/wildmatch.c
@@ -53,6 +53,8 @@
#define ISUPPER(c) (ISASCII(c) && isupper(c))
#define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
#ifdef WILD_TEST_ITERATIONS
int wildmatch_iteration_count;
#endif
-@@ -71,6 +73,8 @@ static int dowild(const uchar *p, const
+@@ -72,6 +74,8 @@ static int dowild(const uchar *p, const uchar *text, const uchar*const *a)
for ( ; (p_ch = *p) != '\0'; text++, p++) {
int matched, special;
uchar t_ch, prev_ch;
+ if (ignore_case && ISUPPER(p_ch))
+ p_ch = tolower(p_ch);
- if ((t_ch = *text) == '\0' && p_ch != '*')
- return ABORT_ALL;
- if (force_lower_case && ISUPPER(t_ch))
-@@ -211,10 +215,13 @@ static int dowild(const uchar *p, const
- /* Match the "pattern" against the "text" string. */
+ while ((t_ch = *text) == '\0') {
+ if (*a == NULL) {
+ if (p_ch != '*')
+@@ -237,12 +241,21 @@ static int dowild(const uchar *p, const uchar *text, const uchar*const *a)
+ * of "text" and any strings in array "a". */
+ static int doliteral(const uchar *s, const uchar *text, const uchar*const *a)
+ {
++ uchar s_ch, t_ch;
+ for ( ; *s != '\0'; text++, s++) {
+ while (*text == '\0') {
+ if ((text = *a++) == NULL)
+ return FALSE;
+ }
+- if (*text != *s)
++ s_ch = *s;
++ t_ch = *text;
++ if (ignore_case) {
++ if (ISUPPER(s_ch))
++ s_ch = tolower(s_ch);
++ if (ISUPPER(t_ch))
++ t_ch = tolower(t_ch);
++ }
++ if (t_ch != s_ch)
+ return FALSE;
+ }
+
+@@ -288,10 +301,14 @@ static const uchar *trailing_N_elements(const uchar*const **a_ptr, int count)
int wildmatch(const char *pattern, const char *text)
{
+ static const uchar *nomore[1]; /* A NULL pointer. */
+ int ret;
#ifdef WILD_TEST_ITERATIONS
wildmatch_iteration_count = 0;
#endif
-- return dowild((const uchar*)pattern, (const uchar*)text) == TRUE;
+- return dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
+ force_lower_case = ignore_case;
-+ ret = dowild((const uchar*)pattern, (const uchar*)text) == TRUE;
++ ret = dowild((const uchar*)pattern, (const uchar*)text, nomore) == TRUE;
+ force_lower_case = 0;
++ return ret;
}
/* Match the "pattern" against the forced-to-lower-case "text" string. */
---- orig/options.c 2005-12-24 07:49:26
-+++ options.c 2005-10-14 19:19:18
-@@ -105,6 +105,7 @@ OFF_T max_size = 0;
+@@ -331,12 +348,14 @@ int wildmatch_array(const char *pattern, const char*const *texts, int where)
+ if (!text)
+ return FALSE;
+
++ force_lower_case = ignore_case;
++
+ if ((matched = dowild(p, text, a)) != TRUE && where < 0
+ && matched != ABORT_ALL) {
+ while (1) {
+ if (*text == '\0') {
+ if ((text = (uchar*)*a++) == NULL)
+- return FALSE;
++ break;
+ continue;
+ }
+ if (*text++ == '/' && (matched = dowild(p, text, a)) != FALSE
+@@ -344,6 +363,9 @@ int wildmatch_array(const char *pattern, const char*const *texts, int where)
+ break;
+ }
+ }
++
++ force_lower_case = 0;
++
+ return matched == TRUE;
+ }
+
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -116,6 +116,7 @@ OFF_T max_size = 0;
OFF_T min_size = 0;
int ignore_errors = 0;
int modify_window = 0;
int blocking_io = -1;
int checksum_seed = 0;
int inplace = 0;
-@@ -342,6 +343,7 @@ void usage(enum logcode F)
- rprintf(F," --include-from=FILE read include patterns from FILE\n");
+@@ -402,6 +403,7 @@ void usage(enum logcode F)
rprintf(F," --files-from=FILE read list of source-file names from FILE\n");
rprintf(F," -0, --from0 all *-from/filter files are delimited by 0s\n");
+ rprintf(F," -s, --protect-args no space-splitting; only wildcard special-chars\n");
+ rprintf(F," --ignore-case ignore case when comparing filenames\n");
rprintf(F," --address=ADDRESS bind address for outgoing socket to daemon\n");
rprintf(F," --port=PORT specify double-colon alternate port number\n");
- rprintf(F," --blocking-io use blocking I/O for the remote shell\n");
-@@ -485,6 +487,7 @@ static struct poptOption long_options[]
+ rprintf(F," --sockopts=OPTIONS specify custom TCP options\n");
+@@ -595,6 +597,8 @@ static struct poptOption long_options[] = {
+ {"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
+ {"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
{"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
++ {"ignore-case", 0, POPT_ARG_VAL, &ignore_case, 1, 0, 0 },
++ {"no-ignore-case", 0, POPT_ARG_VAL, &ignore_case, 0, 0, 0 },
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
- {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
-+ {"ignore-case", 0, POPT_ARG_NONE, &ignore_case, 0, 0, 0 },
- {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
- {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
- {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1575,6 +1578,9 @@ void server_options(char **args,int *arg
+ {"from0", '0', POPT_ARG_VAL, &eol_nulls, 1, 0, 0},
+ {"no-from0", 0, POPT_ARG_VAL, &eol_nulls, 0, 0, 0},
+@@ -1908,6 +1912,9 @@ void server_options(char **args, int *argc_p)
args[ac++] = arg;
}
+ args[ac++] = "--ignore-case";
+
if (partial_dir && am_sender) {
- if (partial_dir != partialdir_for_delayupdate) {
+ if (partial_dir != tmp_partialdir) {
args[ac++] = "--partial-dir";
---- orig/t_stub.c 2005-11-12 20:13:05
-+++ t_stub.c 2005-11-12 20:14:28
-@@ -27,6 +27,7 @@
- **/
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -402,6 +402,7 @@ to the detailed description below for a complete description. verb(
+ --files-from=FILE read list of source-file names from FILE
+ -0, --from0 all *from/filter files are delimited by 0s
+ -s, --protect-args no space-splitting; wildcard chars only
++ --ignore-case ignore case when comparing filenames
+ --address=ADDRESS bind address for outgoing socket to daemon
+ --port=PORT specify double-colon alternate port number
+ --sockopts=OPTIONS specify custom TCP options
+@@ -1409,6 +1410,10 @@ If you use this option with bf(--iconv), the args will also be translated
+ from the local to the remote character set. The translation happens before
+ wild-cards are expanded. See also the bf(--files-from) option.
- int modify_window = 0;
-+int ignore_case = 0;
- int module_id = -1;
- int relative_paths = 0;
- int human_readable = 0;
---- orig/util.c 2005-11-12 20:13:05
-+++ util.c 2005-11-12 20:14:39
-@@ -30,6 +30,7 @@
- extern int verbose;
- extern int dry_run;
- extern int module_id;
-+extern int ignore_case;
- extern int modify_window;
- extern int relative_paths;
- extern int human_readable;
-@@ -1045,11 +1046,23 @@ int u_strcmp(const char *cs1, const char
- {
- const uchar *s1 = (const uchar *)cs1;
- const uchar *s2 = (const uchar *)cs2;
-+
-+ if (ignore_case) {
-+ uchar c1, c2;
-+ while (1) {
-+ c1 = islower(*s1) ? toupper(*s1) : *s1;
-+ c2 = islower(*s2) ? toupper(*s2) : *s2;
-+ if (!c1 || c1 != c2)
-+ break;
-+ s1++, s2++;
-+ }
-
-- while (*s1 && *s2 && (*s1 == *s2)) {
-- s1++; s2++;
-+ return (int)c1 - (int)c2;
- }
-
-+ while (*s1 && *s1 == *s2)
-+ s1++, s2++;
++dit(bf(--ignore-case)) This option tells rsync to ignore upper-/lower-case
++differences when comparing filenames. This can avoid problems when sending
++files to a filesystem that ignores these differences.
+
- return (int)*s1 - (int)*s2;
- }
-
---- orig/wildtest.c 2004-02-07 18:40:52
-+++ wildtest.c 2004-08-13 17:19:34
-@@ -16,6 +16,7 @@ int fnmatch_errors = 0;
+ dit(bf(-T, --temp-dir=DIR)) This option instructs rsync to use DIR as a
+ scratch directory when creating temporary copies of the files transferred
+ on the receiving side. The default behavior is to create each temporary
+diff --git a/wildtest.c b/wildtest.c
+--- a/wildtest.c
++++ b/wildtest.c
+@@ -31,6 +31,7 @@ int fnmatch_errors = 0;
#endif
int wildmatch_errors = 0;
git.samba.org / rsync-patches.git / blobdiff