X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/f6c3b30060864f00f4df7078fe5ae3bc10eb1caa..5214a41bbae94607b196b199b483710e1babf292:/ignore-case.diff

diff --git a/ignore-case.diff b/ignore-case.diff
index 32dd401..4b9d833 100644
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -1,120 +1,282 @@
-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.
-Date: Thu, 18 Apr 2002 23:04:06 -0400
+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 it was for local use.
+ - Make this code handle multibyte character encodings, and honor the
+   --iconv setting when converting case.
 
-NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED!
-
--- David
-
-/-----------------------------------------------------------------------\
- \               David Bolen            \   E-mail: db3l@fitlinxx.com  /
-  |             FitLinxx, Inc.            \  Phone: (203) 708-5192    |
- /  860 Canal Street, Stamford, CT  06902   \  Fax: (203) 316-5150     \
-\-----------------------------------------------------------------------/
-
-	  - - - - - - - - - - - - - - - - - - - - - - - - -
-
---- orig/lib/wildmatch.c	2003-07-14 15:12:59
-+++ lib/wildmatch.c	2004-06-18 17:27:00
-@@ -76,8 +76,20 @@ static int domatch(const unsigned char *
- 	    ch = *++p;
- 	    /* FALLTHROUGH */
- 	  default:
--	    if (*text != ch)
-+	    if (*text != ch) {
-+		extern int ignore_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(*text)) {
-+			if (tolower(*text) == ch)
-+			    continue;
-+		    }
-+		    else if (ISUPPER(ch)) {
-+			if (*text == tolower(ch))
-+			    continue;
-+		    }
++			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;
-+	    }
- 	    continue;
- 	  case '?':
- 	    /* Match anything but '/'. */
---- orig/options.c	2004-07-16 20:07:22
-+++ options.c	2004-07-03 20:19:20
-@@ -92,6 +92,7 @@ int opt_ignore_existing = 0;
- int max_delete = 0;
+ 	}
+-	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;
-@@ -285,6 +286,7 @@ void usage(enum logcode F)
-   rprintf(F,"     --include-from=FILE     don't exclude patterns listed in FILE\n");
-   rprintf(F,"     --files-from=FILE       read FILE for list of source-file names\n");
-   rprintf(F," -0  --from0                 all *-from file lists are delimited by nulls\n");
+@@ -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,"     --version               print version number\n");
-   rprintf(F,"     --daemon                run as an rsync daemon\n");
-   rprintf(F,"     --no-detach             do not detach from the parent\n");
-@@ -340,6 +342,7 @@ static struct poptOption long_options[] 
-   {"include",          0,  POPT_ARG_STRING, 0,              OPT_INCLUDE, 0, 0 },
-   {"exclude-from",     0,  POPT_ARG_STRING, 0,              OPT_EXCLUDE_FROM, 0, 0 },
-   {"include-from",     0,  POPT_ARG_STRING, 0,              OPT_INCLUDE_FROM, 0, 0 },
-+  {"ignore-case",      0,  POPT_ARG_NONE,   &ignore_case, 0, 0, 0 },
-   {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
-   {"help",            'h', POPT_ARG_NONE,   0,              'h', 0, 0 },
-   {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
-@@ -963,6 +966,9 @@ void server_options(char **args,int *arg
+   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 (keep_partial)
- 		args[ac++] = "--partial";
+ 	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.
  
---- orig/util.c	2004-06-09 21:54:47
-+++ util.c	2004-07-03 20:19:20
-@@ -951,6 +951,19 @@ int u_strcmp(const char *cs1, const char
- {
- 	const uchar *s1 = (const uchar *)cs1;
- 	const uchar *s2 = (const uchar *)cs2;
-+	extern int ignore_case;
-+ 	
-+	if (ignore_case) {
-+		while (*s1 && *s2) {
-+			uchar c1 = islower(*s1) ? toupper(*s1) : *s1;
-+			uchar c2 = islower(*s2) ? toupper(*s2) : *s2;
-+			if (c1 != c2)
-+				return (int)c1 - (int)c2;
-+			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;
-+	}
+ 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 = ',';
  
- 	while (*s1 && *s2 && (*s1 == *s2)) {
- 		s1++; s2++;