extern int ignore_errors;
extern int numeric_ids;
extern int recurse;
-@@ -2493,7 +2494,7 @@ static int found_prefix;
- int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -2494,6 +2495,7 @@ int f_name_cmp(const struct file_struct
{
int dif;
-- const uchar *c1, *c2;
-+ const uchar *c1, *c2, ch1, ch2;
+ 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;
-@@ -2604,7 +2605,15 @@ int f_name_cmp(const struct file_struct
+@@ -2604,7 +2606,15 @@ int f_name_cmp(const struct file_struct
if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
}
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");
-@@ -590,6 +592,8 @@ static struct poptOption long_options[]
+@@ -593,6 +595,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},
-@@ -1896,6 +1900,9 @@ void server_options(char **args, int *ar
+@@ -1907,6 +1911,9 @@ void server_options(char **args, int *ar
args[ac++] = arg;
}