X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/8a524ae04add171381406fc2799ede1a10808d6a..c1ff70aa47e11c5b37634479a0facee775a7b6d9:/ignore-case.diff diff --git a/ignore-case.diff b/ignore-case.diff index ea75430..f0601fb 100644 --- a/ignore-case.diff +++ b/ignore-case.diff @@ -1,247 +1,282 @@ -From rsync-admin@lists.samba.org Thu Apr 18 20:05:33 2002 -Return-Path: -Delivered-To: mbp@samba.org -Received: from va.samba.org (localhost [127.0.0.1]) - by lists.samba.org (Postfix) with ESMTP - id 8AD0349D4; Thu, 18 Apr 2002 20:05:32 -0700 (PDT) -Delivered-To: rsync@lists.samba.org -Received: from ctmsg01.corp.fitlinxx.com (mail.fitlinxx.com [208.247.212.10]) - by lists.samba.org (Postfix) with ESMTP id 12ED449C6 - for ; Thu, 18 Apr 2002 20:05:00 -0700 (PDT) -Received: by ctmsg01.corp.fitlinxx.com with Internet Mail Service (5.5.2653.19) - id ; Thu, 18 Apr 2002 23:04:07 -0400 -Message-ID: <926F937512224245A616323693D3F16B1C0022@ctmsg01.corp.fitlinxx.com> -From: David Bolen -To: 'Peter Tattam' -Cc: rsync@lists.samba.org -Subject: RE: mixed case file systems. -MIME-Version: 1.0 -X-Mailer: Internet Mail Service (5.5.2653.19) -Content-Type: text/plain; - charset="iso-8859-1" -Sender: rsync-admin@lists.samba.org -Errors-To: rsync-admin@lists.samba.org -X-BeenThere: rsync@lists.samba.org -X-Mailman-Version: 2.0.8 -Precedence: bulk -List-Help: -List-Post: -List-Subscribe: , - -List-Id: rsync user list -List-Unsubscribe: , - -List-Archive: -X-Original-Date: Thu, 18 Apr 2002 23:04:06 -0400 -Date: Thu, 18 Apr 2002 23:04:06 -0400 -Status: RO -X-Status: A -Content-Length: 6452 -Lines: 205 +This adds the --ignore-case option, which makes rsync compare filenames +in a case-insensitive manner. -Peter Tattam [peter@jazz-1.trumpet.com.au] writes: +To use this patch, run these commands for a successful build: -> I believe a suitable workaround would be to ignore case for file names -> when the rsync process is undertaken. Is this facility available or -> planned in the near future? + patch -p1 pattern,'/')) { - ret->local = 1; -+ } -+ -+ if (ignore_case) { -+ ret->fnmatch_flags |= FNM_CASEFOLD; - } - - return ret; -Index: util.c -=================================================================== -RCS file: e:/binaries/cvs/ni/bin/rsync/util.c,v -retrieving revision 1.2 -retrieving revision 1.3 -diff -c -r1.2 -r1.3 -*** util.c 2000/07/07 03:23:40 1.2 ---- util.c 2001/06/14 04:30:17 1.3 -*************** -*** 838,849 **** - { - const uchar *s1 = (const uchar *)cs1; - const uchar *s2 = (const uchar *)cs2; - -! while (*s1 && *s2 && (*s1 == *s2)) { -! s1++; s2++; - } -- -- return (int)*s1 - (int)*s2; - } - - static OFF_T last_ofs; ---- 836,856 ---- - { - const uchar *s1 = (const uchar *)cs1; - const uchar *s2 = (const uchar *)cs2; -+ extern int ignore_case; -+ -+ if (ignore_case) { -+ while (*s1 && *s2 && (toupper(*s1) == toupper(*s2))) { -+ s1++; s2++; -+ } -+ -+ return (int)toupper(*s1) - (int)toupper(*s2); -+ } else { -+ while (*s1 && *s2 && (*s1 == *s2)) { -+ s1++; s2++; -+ } - -! return (int)*s1 - (int)*s2; - } - } - - static OFF_T last_ofs; - --- -To unsubscribe or change options: http://lists.samba.org/mailman/listinfo/rsync -Before posting, read: http://www.tuxedo.org/~esr/faqs/smart-questions.html + - Make this code handle multibyte character encodings, and honor the + --iconv setting when converting case. +based-on: a01e3b490eb36ccf9e704840e1b6683dab867550 +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 am_server; + extern int am_sender; +@@ -687,16 +688,15 @@ static int rule_matches(const char *fname, filter_rule *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 +@@ -34,6 +34,7 @@ extern int am_generator; + extern int inc_recurse; + extern int always_checksum; + extern int module_id; ++extern int ignore_case; + extern int ignore_errors; + extern int numeric_ids; + extern int recurse; +@@ -3010,6 +3011,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; +@@ -3120,7 +3122,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 +@@ -85,3 +85,38 @@ init_stat_x(stat_x *sx_p) + sx_p->xattr = NULL; + #endif + } ++ ++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)) + ++extern int ignore_case; ++ + #ifdef WILD_TEST_ITERATIONS + int wildmatch_iteration_count; + #endif +@@ -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); + 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, nomore) == TRUE; ++ force_lower_case = ignore_case; ++ 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. */ +@@ -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 +@@ -117,6 +117,7 @@ OFF_T max_size = 0; + OFF_T min_size = 0; + int ignore_errors = 0; + int modify_window = 0; ++int ignore_case = 0; + int blocking_io = -1; + int checksum_seed = 0; + int inplace = 0; +@@ -760,6 +761,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," --sockopts=OPTIONS specify custom TCP options\n"); +@@ -974,6 +976,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_VAL, &eol_nulls, 1, 0, 0}, + {"no-from0", 0, POPT_ARG_VAL, &eol_nulls, 0, 0, 0}, +@@ -2557,6 +2561,9 @@ void server_options(char **args, int *argc_p) + args[ac++] = arg; + } + ++ if (ignore_case) ++ args[ac++] = "--ignore-case"; ++ + if (partial_dir && am_sender) { + if (partial_dir != tmp_partialdir) { + args[ac++] = "--partial-dir"; +diff --git a/rsync.yo b/rsync.yo +--- a/rsync.yo ++++ b/rsync.yo +@@ -414,6 +414,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 +@@ -1598,6 +1599,10 @@ default (with is overridden by both the environment and the command-line). + This option will eventually become a new default setting at some + as-yet-undetermined point in the future. + ++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. ++ + 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 +@@ -30,6 +30,7 @@ + int fnmatch_errors = 0; + #endif + ++int ignore_case = 0; + int wildmatch_errors = 0; + char number_separator = ','; +