---- orig/options.c 2004-07-15 16:51:50
-+++ options.c 2004-07-03 20:17:10
-@@ -87,6 +87,7 @@ int size_only = 0;
+--- orig/options.c 2004-07-16 20:07:22
++++ options.c 2004-07-16 20:09:54
+@@ -87,8 +87,10 @@ int size_only = 0;
int bwlimit = 0;
size_t bwlimit_writemax = 0;
int delete_after = 0;
+int delete_sent_files = 0;
int only_existing = 0;
int opt_ignore_existing = 0;
int bwlimit = 0;
size_t bwlimit_writemax = 0;
int delete_after = 0;
+int delete_sent_files = 0;
int only_existing = 0;
int opt_ignore_existing = 0;
- int blocking_io = -1;
- int checksum_seed = 0;
-+int need_messages_from_generator = 0;
- unsigned int block_size = 0;
-
-
-@@ -257,6 +259,7 @@ void usage(enum logcode F)
+@@ -264,6 +266,7 @@ void usage(enum logcode F)
rprintf(F," --delete delete files that don't exist on the sending side\n");
rprintf(F," --delete-excluded also delete excluded files on the receiving side\n");
rprintf(F," --delete-after receiver deletes after transferring, not before\n");
rprintf(F," --delete delete files that don't exist on the sending side\n");
rprintf(F," --delete-excluded also delete excluded files on the receiving side\n");
rprintf(F," --delete-after receiver deletes after transferring, not before\n");
rprintf(F," --ignore-errors delete even if there are I/O errors\n");
rprintf(F," --max-delete=NUM don't delete more than NUM files\n");
rprintf(F," --partial keep partially transferred files\n");
rprintf(F," --ignore-errors delete even if there are I/O errors\n");
rprintf(F," --max-delete=NUM don't delete more than NUM files\n");
rprintf(F," --partial keep partially transferred files\n");
}
enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
}
enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
OPT_REFUSED_BASE = 9000};
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
OPT_REFUSED_BASE = 9000};
{"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing, 0, 0, 0 },
{"delete-after", 0, POPT_ARG_NONE, 0, OPT_DELETE_AFTER, 0, 0 },
{"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED, 0, 0 },
{"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing, 0, 0, 0 },
{"delete-after", 0, POPT_ARG_NONE, 0, OPT_DELETE_AFTER, 0, 0 },
{"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED, 0, 0 },
{"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 },
{"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
{"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 },
{"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 },
{"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
{"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 },
-@@ -512,6 +516,11 @@ int parse_arguments(int *argc, const cha
+@@ -520,6 +524,11 @@ int parse_arguments(int *argc, const cha
-@@ -981,6 +990,9 @@ void server_options(char **args,int *arg
+@@ -1019,6 +1028,9 @@ void server_options(char **args,int *arg
---- orig/receiver.c 2004-07-14 17:12:06
-+++ receiver.c 2004-07-03 20:17:10
-@@ -48,6 +48,7 @@ extern int ignore_errors;
- extern int orig_umask;
- extern int keep_partial;
- extern int checksum_seed;
+--- orig/receiver.c 2004-07-16 20:07:22
++++ receiver.c 2004-07-16 20:09:48
+@@ -43,6 +43,7 @@ extern char *backup_dir;
+ extern char *backup_suffix;
+ extern int backup_suffix_len;
+ extern int cleanup_got_literal;
-
- static void delete_one(char *fn, int is_dir)
- {
-@@ -296,7 +297,7 @@ int recv_files(int f_in, struct file_lis
+ extern int module_id;
+ extern int ignore_errors;
+ extern int orig_umask;
+@@ -311,7 +312,7 @@ int recv_files(int f_in, struct file_lis
char *fname, fbuf[MAXPATHLEN];
char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
char *fname, fbuf[MAXPATHLEN];
char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
char fnamecmpbuf[MAXPATHLEN];
struct map_struct *mapbuf;
struct file_struct *file;
char fnamecmpbuf[MAXPATHLEN];
struct map_struct *mapbuf;
struct file_struct *file;
-@@ -478,16 +479,20 @@ int recv_files(int f_in, struct file_lis
+@@ -508,16 +509,20 @@ int recv_files(int f_in, struct file_lis
MSG_DONE=5, /* current phase is done */
MSG_REDO=4, /* reprocess indicated flist index */
MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
MSG_DONE=5, /* current phase is done */
MSG_REDO=4, /* reprocess indicated flist index */
MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
--delete delete files that don't exist on sender
--delete-excluded also delete excluded files on receiver
--delete-after receiver deletes after transfer, not before
--delete delete files that don't exist on sender
--delete-excluded also delete excluded files on receiver
--delete-after receiver deletes after transfer, not before
--ignore-errors delete even if there are I/O errors
--max-delete=NUM don't delete more than NUM files
--partial keep partially transferred files
--ignore-errors delete even if there are I/O errors
--max-delete=NUM don't delete more than NUM files
--partial keep partially transferred files
sufficient space on the receiving filesystem. If you want to delete
after transferring, use the --delete-after switch. Implies --delete.
sufficient space on the receiving filesystem. If you want to delete
after transferring, use the --delete-after switch. Implies --delete.
---- orig/sender.c 2004-07-15 02:21:11
-+++ sender.c 2004-07-03 20:17:10
-@@ -27,6 +27,7 @@ extern int dry_run;
+--- orig/sender.c 2004-07-16 20:07:23
++++ sender.c 2004-07-16 20:10:19
+@@ -26,6 +26,7 @@ extern int io_error;
+ extern int dry_run;
-@@ -123,6 +146,8 @@ void send_files(struct file_list *flist,
+@@ -125,6 +148,8 @@ void send_files(struct file_list *flist,
-@@ -245,6 +270,9 @@ void send_files(struct file_list *flist,
+@@ -247,6 +272,9 @@ void send_files(struct file_list *flist,