- Make this code handle multibyte character encodings, and honor the
--iconv setting when converting case.
-based-on: 3b8f8192227b14e708bf535072485e50f4362270
+based-on: 8946cfc6f8018e30740ee1db4cc2e2008e4f7e7e
diff --git a/exclude.c b/exclude.c
--- a/exclude.c
+++ b/exclude.c
extern int ignore_errors;
extern int numeric_ids;
extern int recurse;
-@@ -2982,6 +2983,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -3017,6 +3018,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
{
int dif;
const uchar *c1, *c2;
enum fnc_state state1, state2;
enum fnc_type type1, type2;
enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
-@@ -3092,7 +3094,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -3127,7 +3129,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
}
diff --git a/ifuncs.h b/ifuncs.h
--- a/ifuncs.h
+++ b/ifuncs.h
-@@ -77,3 +77,38 @@ init_stat_x(stat_x *sx_p)
- sx_p->xattr = NULL;
+@@ -104,3 +104,38 @@ free_stat_x(stat_x *sx_p)
+ }
#endif
}
+
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;
+@@ -118,6 +118,7 @@ OFF_T max_size = -1;
+ OFF_T min_size = -1;
int ignore_errors = 0;
int modify_window = 0;
+int ignore_case = 0;
int blocking_io = -1;
int checksum_seed = 0;
int inplace = 0;
-@@ -760,6 +761,7 @@ void usage(enum logcode F)
+@@ -775,6 +776,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," --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");
-@@ -974,6 +976,8 @@ static struct poptOption long_options[] = {
+@@ -997,6 +999,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 },
{"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},
-@@ -2523,6 +2527,9 @@ void server_options(char **args, int *argc_p)
+@@ -2638,6 +2642,9 @@ void server_options(char **args, int *argc_p)
args[ac++] = arg;
}
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(
+@@ -430,6 +430,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
--address=ADDRESS bind address for outgoing socket to daemon
--port=PORT specify double-colon alternate port number
--sockopts=OPTIONS specify custom TCP options
-@@ -1583,6 +1584,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
- wild-cards are expanded. See also the bf(--files-from) option.
+@@ -1722,6 +1723,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
+int ignore_case = 0;
int wildmatch_errors = 0;
- char number_separator = ',';
+ typedef char bool;
git.samba.org / rsync-patches.git / blobdiff