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

diff --git a/ignore-case.diff b/ignore-case.diff
index 3703637..f0601fb 100644
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -12,9 +12,19 @@ TODO:
  - Make this code handle multibyte character encodings, and honor the
    --iconv setting when converting case.
 
---- old/exclude.c
-+++ new/exclude.c
-@@ -583,16 +583,15 @@ static int rule_matches(char *name, stru
+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) {
@@ -35,17 +45,18 @@ TODO:
  	}
  
  	return !ret_match;
---- old/flist.c
-+++ new/flist.c
-@@ -35,6 +35,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;
-@@ -2570,6 +2571,7 @@ int f_name_cmp(const struct file_struct 
+@@ -3010,6 +3011,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
  {
  	int dif;
  	const uchar *c1, *c2;
@@ -53,7 +64,7 @@ TODO:
  	enum fnc_state state1, state2;
  	enum fnc_type type1, type2;
  	enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
-@@ -2680,7 +2682,15 @@ int f_name_cmp(const struct file_struct 
+@@ -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;
  		}
@@ -70,11 +81,12 @@ TODO:
  
  	return dif;
  }
---- old/ifuncs.h
-+++ new/ifuncs.h
-@@ -98,3 +98,38 @@ toUpper(const char *ptr)
- {
- 	return toupper(*(unsigned char *)ptr);
+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
@@ -103,16 +115,17 @@ TODO:
 +{
 +	extern int ignore_case;
 +	if (ignore_case)
-+		return strcasecmp(s1, s2, n) == 0;
-+	return strcmp(s1, s2, n) == 0;
++		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))
---- old/lib/wildmatch.c
-+++ new/lib/wildmatch.c
+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))
@@ -122,7 +135,7 @@ TODO:
  #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;
@@ -131,7 +144,7 @@ TODO:
  	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)
  {
@@ -154,7 +167,7 @@ TODO:
  	    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. */
@@ -170,7 +183,7 @@ TODO:
  }
  
  /* Match the "pattern" against the forced-to-lower-case "text" string. */
-@@ -331,12 +348,14 @@ int wildmatch_array(const char *pattern,
+@@ -331,12 +348,14 @@ int wildmatch_array(const char *pattern, const char*const *texts, int where)
      if (!text)
  	return FALSE;
  
@@ -186,7 +199,7 @@ TODO:
  		continue;
  	    }
  	    if (*text++ == '/' && (matched = dowild(p, text, a)) != FALSE
-@@ -344,6 +363,9 @@ int wildmatch_array(const char *pattern,
+@@ -344,6 +363,9 @@ int wildmatch_array(const char *pattern, const char*const *texts, int where)
  		break;
  	}
      }
@@ -196,9 +209,10 @@ TODO:
      return matched == TRUE;
  }
  
---- old/options.c
-+++ new/options.c
-@@ -115,6 +115,7 @@ OFF_T max_size = 0;
+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;
@@ -206,7 +220,7 @@ TODO:
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -400,6 +401,7 @@ void usage(enum logcode F)
+@@ -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");
@@ -214,7 +228,7 @@ TODO:
    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");
-@@ -593,6 +595,8 @@ 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 },
@@ -223,7 +237,7 @@ TODO:
    {"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},
-@@ -1909,6 +1913,9 @@ void server_options(char **args, int *ar
+@@ -2557,6 +2561,9 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = arg;
  	}
  
@@ -233,9 +247,10 @@ TODO:
  	if (partial_dir && am_sender) {
  		if (partial_dir != tmp_partialdir) {
  			args[ac++] = "--partial-dir";
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -402,6 +402,7 @@ to the detailed description below for a 
+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
@@ -243,9 +258,9 @@ TODO:
       --address=ADDRESS       bind address for outgoing socket to daemon
       --port=PORT             specify double-colon alternate port number
       --sockopts=OPTIONS      specify custom TCP options
-@@ -1383,6 +1384,10 @@ If you use this option with bf(--iconv),
- from the local to the remote character set.  The translation happens before
- wild-cards are expanded.  See also the bf(--files-from) option.
+@@ -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
@@ -254,13 +269,14 @@ TODO:
  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
---- old/wildtest.c
-+++ new/wildtest.c
-@@ -31,6 +31,7 @@ int fnmatch_errors = 0;
+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 = ',';