X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/66e2df0e031d076e65863d4c2ffe132850aa2ff3..e2bccb5999f9abc1e7657dc4d3186782f8ab3eee:/ignore-case.diff

diff --git a/ignore-case.diff b/ignore-case.diff
index f4287fb..91ae734 100644
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -1,8 +1,88 @@
 This adds the --ignore-case option, which makes rsync compare filenames
 in a case-insensitive manner.
 
---- orig/lib/wildmatch.c	2006-01-03 17:26:02
-+++ lib/wildmatch.c	2006-01-03 17:29:11
+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.
+
+--- old/exclude.c
++++ new/exclude.c
+@@ -32,6 +32,7 @@ extern int io_error;
+ extern int local_server;
+ extern int prune_empty_dirs;
+ extern int ignore_perishable;
++extern int ignore_case;
+ extern int delete_mode;
+ extern int delete_excluded;
+ extern int cvs_exclude;
+@@ -580,16 +581,17 @@ static int rule_matches(char *name, stru
+ 		if (litmatch_array(pattern, strings, slash_handling))
+ 			return ret_match;
+ 	} else if (anchored_match) {
+-		if (strcmp(name, pattern) == 0)
++		if ((ignore_case ? strcasecmp(name, pattern)
++				 : strcmp(name, pattern)) == 0)
+ 			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
++		 && (ignore_case ? strcasecmp(name + (l1-l2), pattern)
++				 : strcmp(name + (l1-l2), pattern)) == 0
++		 && (l1 == l2 || name[l1 - (l2+1)] == '/'))
+ 			return ret_match;
+-		}
+ 	}
+ 
+ 	return !ret_match;
+--- old/flist.c
++++ new/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;
+@@ -2454,7 +2455,7 @@ enum fnc_type { t_PATH, t_ITEM };
+ int f_name_cmp(struct file_struct *f1, struct file_struct *f2)
+ {
+ 	int dif;
+-	const uchar *c1, *c2;
++	const uchar *c1, *c2, ch1, ch2;
+ 	enum fnc_state state1, state2;
+ 	enum fnc_type type1, type2;
+ 	enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
+@@ -2564,7 +2565,15 @@ int f_name_cmp(struct file_struct *f1, s
+ 			if (type1 != type2)
+ 				return type1 == t_PATH ? 1 : -1;
+ 		}
+-	} while ((dif = (int)*c1++ - (int)*c2++) == 0);
++		ch1 = CVAL(c1++, 0);
++		ch2 = CVAL(c2++, 0);
++		if (ignore_case) {
++			if (islower(ch1))
++				ch1 = toupper(ch1);
++			if (islower(ch2))
++				ch2 = toupper(ch2);
++		}
++	} while ((dif = ch1 - ch2) == 0);
+ 
+ 	return dif;
+ }
+--- old/lib/wildmatch.c
++++ new/lib/wildmatch.c
 @@ -53,6 +53,8 @@
  #define ISUPPER(c) (ISASCII(c) && isupper(c))
  #define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
@@ -21,7 +101,30 @@ in a case-insensitive manner.
  	while ((t_ch = *text) == '\0') {
  	    if (*a == NULL) {
  		if (p_ch != '*')
-@@ -288,10 +292,14 @@ static const uchar *trailing_N_elements(
+@@ -237,12 +241,21 @@ static int dowild(const uchar *p, const 
+  * 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(
  int wildmatch(const char *pattern, const char *text)
  {
      static const uchar *nomore[1]; /* A NULL pointer. */
@@ -37,9 +140,35 @@ in a case-insensitive manner.
  }
  
  /* 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,
+     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,
+ 		break;
+ 	}
+     }
++
++    force_lower_case = 0;
++
+     return matched == TRUE;
+ }
+ 
+--- old/options.c
++++ new/options.c
+@@ -114,6 +114,7 @@ OFF_T max_size = 0;
  OFF_T min_size = 0;
  int ignore_errors = 0;
  int modify_window = 0;
@@ -47,23 +176,24 @@ in a case-insensitive manner.
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -342,6 +343,7 @@ void usage(enum logcode F)
+@@ -389,6 +390,7 @@ void usage(enum logcode F)
    rprintf(F,"     --include-from=FILE     read include patterns from FILE\n");
    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,"     --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");
+@@ -577,6 +579,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},
+@@ -1850,6 +1854,9 @@ void server_options(char **args,int *arg
  		args[ac++] = arg;
  	}
  
@@ -71,57 +201,11 @@ in a case-insensitive manner.
 +		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 @@
-  **/
- 
- 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++;
-+
- 	return (int)*s1 - (int)*s2;
- }
- 
---- orig/wildtest.c	2006-01-03 17:26:02
-+++ wildtest.c	2004-08-13 17:19:34
-@@ -16,6 +16,7 @@ int fnmatch_errors = 0;
+--- old/wildtest.c
++++ new/wildtest.c
+@@ -31,6 +31,7 @@ int fnmatch_errors = 0;
  #endif
  
  int wildmatch_errors = 0;