extern int preserve_specials;
extern int preserve_hard_links;
extern int preserve_executability;
extern int preserve_specials;
extern int preserve_hard_links;
extern int preserve_executability;
-@@ -1495,7 +1496,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1494,7 +1495,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
{"specials", 0, POPT_ARG_VAL, &preserve_specials, 1, 0, 0 },
{"no-specials", 0, POPT_ARG_VAL, &preserve_specials, 0, 0, 0 },
{"links", 'l', POPT_ARG_VAL, &preserve_links, 1, 0, 0 },
{"specials", 0, POPT_ARG_VAL, &preserve_specials, 1, 0, 0 },
{"no-specials", 0, POPT_ARG_VAL, &preserve_specials, 0, 0, 0 },
{"links", 'l', POPT_ARG_VAL, &preserve_links, 1, 0, 0 },
-@@ -2646,6 +2649,9 @@ void server_options(char **args, int *argc_p)
+@@ -2661,6 +2664,9 @@ void server_options(char **args, int *argc_p)
-@@ -340,6 +340,20 @@ void send_files(int f_in, int f_out)
+@@ -341,6 +341,20 @@ void send_files(int f_in, int f_out)