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

diff --git a/ignore-case.diff b/ignore-case.diff
index 65ee9c1..4b9d833 100644
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -12,8 +12,8 @@ TODO:
  - Make this code handle multibyte character encodings, and honor the
    --iconv setting when converting case.
 
+based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
 diff --git a/exclude.c b/exclude.c
-index 5fa6e00..5b3b135 100644
 --- a/exclude.c
 +++ b/exclude.c
 @@ -21,6 +21,7 @@
@@ -24,7 +24,7 @@ index 5fa6e00..5b3b135 100644
  
  extern int am_server;
  extern int am_sender;
-@@ -697,16 +698,15 @@ static int rule_matches(const char *fname, struct filter_struct *ex, int name_is
+@@ -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) {
@@ -46,7 +46,6 @@ index 5fa6e00..5b3b135 100644
  
  	return !ret_match;
 diff --git a/flist.c b/flist.c
-index 09b4fc5..ae70300 100644
 --- a/flist.c
 +++ b/flist.c
 @@ -34,6 +34,7 @@ extern int am_generator;
@@ -57,7 +56,7 @@ index 09b4fc5..ae70300 100644
  extern int ignore_errors;
  extern int numeric_ids;
  extern int recurse;
-@@ -2924,6 +2925,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -2991,6 +2992,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
  {
  	int dif;
  	const uchar *c1, *c2;
@@ -65,7 +64,7 @@ index 09b4fc5..ae70300 100644
  	enum fnc_state state1, state2;
  	enum fnc_type type1, type2;
  	enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
-@@ -3034,7 +3036,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -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;
  		}
@@ -83,10 +82,9 @@ index 09b4fc5..ae70300 100644
  	return dif;
  }
 diff --git a/ifuncs.h b/ifuncs.h
-index 8c128d5..a4cfd3d 100644
 --- a/ifuncs.h
 +++ b/ifuncs.h
-@@ -77,3 +77,38 @@ init_stat_x(stat_x *sx_p)
+@@ -85,3 +85,38 @@ init_stat_x(stat_x *sx_p)
  	sx_p->xattr = NULL;
  #endif
  }
@@ -126,7 +124,6 @@ index 8c128d5..a4cfd3d 100644
 +#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
-index f3a1731..72660ca 100644
 --- a/lib/wildmatch.c
 +++ b/lib/wildmatch.c
 @@ -53,6 +53,8 @@
@@ -213,7 +210,6 @@ index f3a1731..72660ca 100644
  }
  
 diff --git a/options.c b/options.c
-index e7c6c61..6e73e9c 100644
 --- a/options.c
 +++ b/options.c
 @@ -117,6 +117,7 @@ OFF_T max_size = 0;
@@ -224,7 +220,7 @@ index e7c6c61..6e73e9c 100644
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -759,6 +760,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");
@@ -232,7 +228,7 @@ index e7c6c61..6e73e9c 100644
    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");
-@@ -973,6 +975,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 },
@@ -241,7 +237,7 @@ index e7c6c61..6e73e9c 100644
    {"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},
-@@ -2505,6 +2509,9 @@ void server_options(char **args, int *argc_p)
+@@ -2542,6 +2546,9 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = arg;
  	}
  
@@ -252,7 +248,6 @@ index e7c6c61..6e73e9c 100644
  		if (partial_dir != tmp_partialdir) {
  			args[ac++] = "--partial-dir";
 diff --git a/rsync.yo b/rsync.yo
-index 941f7a5..339aca8 100644
 --- a/rsync.yo
 +++ b/rsync.yo
 @@ -414,6 +414,7 @@ to the detailed description below for a complete description.  verb(
@@ -263,7 +258,7 @@ index 941f7a5..339aca8 100644
       --address=ADDRESS       bind address for outgoing socket to daemon
       --port=PORT             specify double-colon alternate port number
       --sockopts=OPTIONS      specify custom TCP options
-@@ -1563,6 +1564,10 @@ If you use this option with bf(--iconv), the args will also be translated
+@@ -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.
  
@@ -275,7 +270,6 @@ index 941f7a5..339aca8 100644
  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
-index 07351a1..c899eb8 100644
 --- a/wildtest.c
 +++ b/wildtest.c
 @@ -30,6 +30,7 @@