--- old/flist.c
+++ new/flist.c
-@@ -32,6 +32,7 @@ extern int am_sender;
+@@ -34,6 +34,7 @@ extern int incremental;
extern int do_progress;
extern int always_checksum;
extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
extern int recurse;
-@@ -1783,7 +1784,7 @@ int f_name_cmp(struct file_struct *f1, s
+@@ -2161,7 +2162,7 @@ int f_name_cmp(struct file_struct *f1, s
if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
if (!*c1) {
switch (state1) {
case s_DIR:
-@@ -1846,7 +1847,16 @@ int f_name_cmp(struct file_struct *f1, s
+@@ -2224,7 +2225,16 @@ int f_name_cmp(struct file_struct *f1, s
if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
}
int blocking_io = -1;
int checksum_seed = 0;
int inplace = 0;
-@@ -361,6 +362,7 @@ void usage(enum logcode F)
+@@ -358,6 +359,7 @@ void usage(enum logcode F)
rprintf(F," --include-from=FILE read include patterns from FILE\n");
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," --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");
-@@ -525,6 +527,7 @@ static struct poptOption long_options[]
+@@ -523,6 +525,7 @@ static struct poptOption long_options[]
{"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_NONE, &eol_nulls, 0, 0, 0},
{"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
{"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
{"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1688,6 +1691,9 @@ void server_options(char **args,int *arg
+@@ -1704,6 +1707,9 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}