X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/a5e6228afbf1809d33d9a31e0895c5e955c39ce1..f9df736a3e22f15307f9e304eb9069b06e94208f:/ignore-case.diff

diff --git a/ignore-case.diff b/ignore-case.diff
index eb5623d..7fbcbc6 100644
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -55,7 +55,7 @@ diff --git a/flist.c b/flist.c
  extern int ignore_errors;
  extern int numeric_ids;
  extern int recurse;
-@@ -2615,6 +2616,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -2617,6 +2618,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
  {
  	int dif;
  	const uchar *c1, *c2;
@@ -63,7 +63,7 @@ diff --git a/flist.c b/flist.c
  	enum fnc_state state1, state2;
  	enum fnc_type type1, type2;
  	enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
-@@ -2725,7 +2727,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -2727,7 +2729,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
  			if (type1 != type2)
  				return type1 == t_PATH ? 1 : -1;
  		}
@@ -219,7 +219,7 @@ diff --git a/options.c b/options.c
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -403,6 +404,7 @@ void usage(enum logcode F)
+@@ -407,6 +408,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");
@@ -227,7 +227,7 @@ diff --git a/options.c b/options.c
    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");
-@@ -596,6 +598,8 @@ static struct poptOption long_options[] = {
+@@ -602,6 +604,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 },
@@ -236,7 +236,7 @@ diff --git a/options.c b/options.c
    {"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},
-@@ -1917,6 +1921,9 @@ void server_options(char **args, int *argc_p)
+@@ -1939,6 +1943,9 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = arg;
  	}
  
@@ -258,7 +258,7 @@ diff --git a/rsync.yo b/rsync.yo
       --port=PORT             specify double-colon alternate port number
       --sockopts=OPTIONS      specify custom TCP options
 @@ -1425,6 +1426,10 @@ If you use this option with bf(--iconv), the args will also be translated
- from the local to the remote character set.  The translation happens before
+ from the local to the remote character-set.  The translation happens before
  wild-cards are expanded.  See also the bf(--files-from) option.
  
 +dit(bf(--ignore-case)) This option tells rsync to ignore upper-/lower-case