X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/1a2bc9cd5090ca968629f4c4a4915a8e49231386..77a7a0f0b45a1983e0a1181002efab13f1ad3919:/ignore-case.diff

diff --git a/ignore-case.diff b/ignore-case.diff
index 5a0b6cb..02b00ee 100644
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -1,8 +1,84 @@
 This adds the --ignore-case option, which makes rsync compare filenames
 in a case-insensitive manner.
 
---- orig/lib/wildmatch.c	2005-01-28 21:01:21
-+++ lib/wildmatch.c	2004-08-13 16:43:27
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/ignore-case.diff
+    ./configure                            (optional if already run)
+    make
+
+--- 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
+@@ -34,6 +34,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;
+@@ -2224,7 +2225,7 @@ int f_name_cmp(struct file_struct *f1, s
+ 	if (type1 != type2)
+ 		return type1 == t_PATH ? 1 : -1;
+ 
+-	do {
++	while (1) {
+ 		if (!*c1) {
+ 			switch (state1) {
+ 			case s_DIR:
+@@ -2287,7 +2288,16 @@ 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);
++		if (ignore_case) {
++			uchar ch1, ch2;
++			ch1 = islower(*c1) ? toupper(*c1) : *c1;
++			ch2 = islower(*c2) ? toupper(*c2) : *c2;
++			c1++, c2++;
++			if ((dif = (int)ch1 - (int)ch2) != 0)
++				break;
++		} else if ((dif = (int)*c1++ - (int)*c2++) != 0)
++			break;
++	}
+ 
+ 	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))
@@ -12,56 +88,107 @@ in a case-insensitive manner.
  #ifdef WILD_TEST_ITERATIONS
  int wildmatch_iteration_count;
  #endif
-@@ -76,9 +78,19 @@ static int domatch(const uchar *p, const
- 	    ch = *++p;
- 	    /* FALLTHROUGH */
- 	  default:
--	    if (*text != ch)
--		return FALSE;
--	    continue;
-+	    if (*text == ch)
-+		continue;
-+	    if (ignore_case) {
-+		if (ISUPPER(*text)) {
-+		    if (tolower(*text) == ch)
-+			continue;
-+		}
-+		else if (ISUPPER(ch)) {
-+		    if (*text == tolower(ch))
-+			continue;
-+		}
-+	    }
-+	    return FALSE;
- 	  case '?':
- 	    /* Match anything but '/'. */
- 	    if (*text == '/')
---- orig/options.c	2005-05-19 08:52:42
-+++ options.c	2005-05-03 16:47:52
-@@ -101,6 +101,7 @@ int max_delete = 0;
- OFF_T max_size = 0;
+@@ -72,6 +74,8 @@ static int dowild(const uchar *p, const 
+     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 
+  * 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. */
++    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,
+     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
+@@ -112,6 +112,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;
-@@ -332,6 +333,7 @@ void usage(enum logcode F)
+@@ -367,6 +368,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");
-@@ -392,6 +394,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 },
+   rprintf(F,"     --sockopts=OPTIONS      specify custom TCP options\n");
+@@ -539,6 +541,7 @@ static struct poptOption long_options[] 
+   {"only-write-batch", 0,  POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 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 },
-   {"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 },
-@@ -1410,6 +1413,9 @@ void server_options(char **args,int *arg
+   {"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 },
+@@ -1738,6 +1741,9 @@ void server_options(char **args,int *arg
  		args[ac++] = arg;
  	}
  
@@ -69,57 +196,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-01-25 10:39:14
-+++ t_stub.c	2004-08-13 17:19:56
-@@ -28,6 +28,7 @@
- 
- int modify_window = 0;
- int module_id = -1;
-+int ignore_case = 0;
- char *partial_dir;
- struct filter_list_struct server_filter_list;
- 
---- orig/util.c	2005-05-03 16:47:33
-+++ util.c	2004-08-13 16:40:34
-@@ -31,6 +31,7 @@ extern int verbose;
- extern int dry_run;
- extern int module_id;
- extern int modify_window;
-+extern int ignore_case;
- extern char *partial_dir;
- extern struct filter_list_struct server_filter_list;
- 
-@@ -1029,11 +1030,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	2004-02-07 18:40:52
-+++ 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;