-From rsync-admin@lists.samba.org Thu Apr 18 20:05:33 2002
-Return-Path: <rsync-admin@lists.samba.org>
-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 <rsync@lists.samba.org>; Thu, 18 Apr 2002 20:05:00 -0700 (PDT)
-Received: by ctmsg01.corp.fitlinxx.com with Internet Mail Service (5.5.2653.19)
- id <JCL2B4NB>; Thu, 18 Apr 2002 23:04:07 -0400
-Message-ID: <926F937512224245A616323693D3F16B1C0022@ctmsg01.corp.fitlinxx.com>
-From: David Bolen <db3l@fitlinxx.com>
-To: 'Peter Tattam' <peter@jazz-1.trumpet.com.au>
-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: <mailto:rsync-request@lists.samba.org?subject=help>
-List-Post: <mailto:rsync@lists.samba.org>
-List-Subscribe: <http://lists.samba.org/mailman/listinfo/rsync>,
- <mailto:rsync-request@lists.samba.org?subject=subscribe>
-List-Id: rsync user list <rsync.lists.samba.org>
-List-Unsubscribe: <http://lists.samba.org/mailman/listinfo/rsync>,
- <mailto:rsync-request@lists.samba.org?subject=unsubscribe>
-List-Archive: <http://lists.samba.org/pipermail/rsync/>
-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 <patches/ignore-case.diff
+ ./configure (optional if already run)
+ make
-I've attached a context diff for some changes I made to our local copy
-a while back to add an "--ignore-case" option just for this purpose.
-In our case it came up in the context of disting between NTFS and FAT
-remote systems. I think we ended up not needing it, but it does make
-rsync match filenames in a case insensitive manner, so it might at
-least be worth trying to see if it resolves your issue.
+TODO:
-A few caveats - both ends have to support the option - I couldn't make
-it backwards compatible because both ends exchange information about a
-sorted file list that has to sort the same way on either side (which
-very subtly bit me when I first did this). I also didn't bump the
-protocol in this patch (wasn't quite sure it was appropriate just for an
-incompatible command line option) since since it was for local use.
-
-The patch is based on a 2.4.x series rsync, but if it doesn't apply
-cleanly to 2.5.x, it's should be simple enough to just apply manually.
-
--- David
-
-/-----------------------------------------------------------------------\
- \ David Bolen \ E-mail: db3l@fitlinxx.com /
- | FitLinxx, Inc. \ Phone: (203) 708-5192 |
- / 860 Canal Street, Stamford, CT 06902 \ Fax: (203) 316-5150 \
-\-----------------------------------------------------------------------/
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
-
-Index: options.c
-===================================================================
-RCS file: e:/binaries/cvs/ni/bin/rsync/options.c,v
-retrieving revision 1.5
-retrieving revision 1.7
-diff -c -r1.5 -r1.7
-*** options.c 2000/12/28 00:30:18 1.5
---- options.c 2001/06/20 19:25:24 1.7
-***************
-*** 72,77 ****
---- 72,78 ----
- #else
- int modify_window=0;
- #endif /* _WIN32 */
-+ int ignore_case=0;
- int modify_window_set=0;
- int delete_sent=0;
-
-***************
-*** 162,167 ****
---- 164,170 ----
- rprintf(F," --exclude-from=FILE exclude patterns listed in
-FILE\n");
- rprintf(F," --include=PATTERN don't exclude files matching
-PATTERN\n");
- rprintf(F," --include-from=FILE don't exclude patterns listed in
-FILE\n");
-+ rprintf(F," --ignore-case ignore case when comparing
-filenames\n");
- rprintf(F," --version print version number\n");
- rprintf(F," --daemon run as a rsync daemon\n");
- rprintf(F," --address bind to the specified
-address\n");
-***************
-*** 186,194 ****
- OPT_PROGRESS, OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS,
-OPT_COMPARE_DEST,
- OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS,
- OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR,
-! OPT_IGNORE_ERRORS, OPT_MODIFY_WINDOW, OPT_DELETE_SENT};
-
-! static char *short_options = "oblLWHpguDCtcahvqrRIxnSe:B:T:zP";
-
- static struct option long_options[] = {
- {"version", 0, 0, OPT_VERSION},
---- 189,198 ----
- OPT_PROGRESS, OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS,
-OPT_COMPARE_DEST,
- OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS,
- OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR,
-! OPT_IGNORE_ERRORS, OPT_MODIFY_WINDOW, OPT_DELETE_SENT,
-! OPT_IGNORE_CASE};
-
-! static char *short_options = "oblLWHpguDCtcahvqrRIxnSe:B:T:zP";
-
- static struct option long_options[] = {
- {"version", 0, 0, OPT_VERSION},
-***************
-*** 204,209 ****
---- 208,214 ----
- {"exclude-from",1, 0, OPT_EXCLUDE_FROM},
- {"include", 1, 0, OPT_INCLUDE},
- {"include-from",1, 0, OPT_INCLUDE_FROM},
-+ {"ignore-case", 0, 0, OPT_IGNORE_CASE},
- {"rsync-path", 1, 0, OPT_RSYNC_PATH},
- {"password-file", 1, 0, OPT_PASSWORD_FILE},
- {"one-file-system",0, 0, 'x'},
-***************
-*** 401,406 ****
---- 406,415 ----
- add_exclude_file(optarg,1, 1);
- break;
-
-+ case OPT_IGNORE_CASE:
-+ ignore_case=1;
-+ break;
-+
- case OPT_COPY_UNSAFE_LINKS:
- copy_unsafe_links=1;
- break;
-***************
-*** 712,717 ****
---- 727,736 ----
- slprintf(mwindow,sizeof(mwindow),"--modify-window=%d",
- modify_window);
- args[ac++] = mwindow;
-+ }
-+
-+ if (ignore_case) {
-+ args[ac++] = "--ignore-case";
- }
-
- if (keep_partial)
-Index: exclude.c
-===================================================================
-RCS file: e:/binaries/cvs/ni/bin/rsync/exclude.c,v
-retrieving revision 1.1.1.1
-retrieving revision 1.2
-diff -c -r1.1.1.1 -r1.2
-*** exclude.c 2000/05/30 18:08:19 1.1.1.1
---- exclude.c 2001/06/14 04:30:17 1.2
-***************
-*** 31,36 ****
---- 31,37 ----
- static struct exclude_struct *make_exclude(char *pattern, int include)
- {
- struct exclude_struct *ret;
-+ extern int ignore_case;
-
- ret = (struct exclude_struct *)malloc(sizeof(*ret));
- if (!ret) out_of_memory("make_exclude");
-***************
-*** 72,77 ****
---- 73,82 ----
-
- if (!strchr(ret->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: 24079e988fc31af4eba56cd2701fdc5a4154980d
+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;
+@@ -2991,6 +2992,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;
+@@ -3101,7 +3103,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},
+@@ -2542,6 +2546,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
+@@ -1584,6 +1585,10 @@ side 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.
+
++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 = ',';
+
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff