X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/6100b16e5e0e2591621d9c419fc5c0cd6907f0e4..c1ff70aa47e11c5b37634479a0facee775a7b6d9:/ignore-case.diff

diff --git a/ignore-case.diff b/ignore-case.diff
index 416afee..f0601fb 100644
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -7,23 +7,29 @@ To use this patch, run these commands for a successful build:
     ./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
+TODO:
+
+ - 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 ((ignore_case ? strcasecmp(name, pattern)
-+				 : strcmp(name, pattern)) == 0)
++		if (ic_strEQ(name, pattern))
  			return ret_match;
  	} else {
  		int l1 = strlen(name);
@@ -32,53 +38,94 @@ To use this patch, run these commands for a successful build:
 -		    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
++		 && ic_strEQ(name + (l1-l2), pattern)
 +		 && (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;
+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;
-@@ -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
+@@ -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) {
-+			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;
-+	}
++			if (isupper(ch1))
++				ch1 = tolower(ch1);
++			if (isupper(ch2))
++				ch2 = tolower(ch2);
++		}
++	} while ((dif = (int)ch1 - (int)ch2) == 0);
  
  	return dif;
  }
---- old/lib/wildmatch.c
-+++ new/lib/wildmatch.c
+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))
@@ -88,7 +135,7 @@ To use this patch, run these commands for a successful build:
  #ifdef WILD_TEST_ITERATIONS
  int wildmatch_iteration_count;
  #endif
-@@ -72,6 +74,8 @@ static int dowild(const uchar *p, const 
+@@ -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;
@@ -97,7 +144,7 @@ To use this patch, run these commands for a successful build:
  	while ((t_ch = *text) == '\0') {
  	    if (*a == NULL) {
  		if (p_ch != '*')
-@@ -237,12 +241,21 @@ static int dowild(const uchar *p, const 
+@@ -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)
  {
@@ -120,7 +167,7 @@ To use this patch, run these commands for a successful build:
  	    return FALSE;
      }
  
-@@ -288,10 +301,14 @@ static const uchar *trailing_N_elements(
+@@ -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. */
@@ -136,9 +183,36 @@ To use this patch, run these commands for a successful build:
  }
  
  /* Match the "pattern" against the forced-to-lower-case "text" string. */
---- old/options.c
-+++ new/options.c
-@@ -111,6 +111,7 @@ OFF_T max_size = 0;
+@@ -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;
@@ -146,23 +220,24 @@ To use this patch, run these commands for a successful build:
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -366,6 +367,7 @@ void usage(enum logcode F)
-   rprintf(F,"     --include-from=FILE     read include patterns from FILE\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,"     --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");
-@@ -534,6 +536,7 @@ static struct poptOption long_options[] 
+@@ -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_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 },
-@@ -1733,6 +1736,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},
+@@ -2557,6 +2561,9 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = arg;
  	}
  
@@ -172,13 +247,36 @@ To use this patch, run these commands for a successful build:
  	if (partial_dir && am_sender) {
  		if (partial_dir != tmp_partialdir) {
  			args[ac++] = "--partial-dir";
---- old/wildtest.c
-+++ new/wildtest.c
-@@ -31,6 +31,7 @@ int fnmatch_errors = 0;
+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 wildmatch_errors = 0;
 +int ignore_case = 0;
- 
- typedef char bool;
+ int wildmatch_errors = 0;
+ char number_separator = ',';