After applying this patch and running configure, you MUST run this command before "make": make proto --- orig/io.c 2004-07-24 16:52:09 +++ io.c 2004-07-03 20:17:10 @@ -240,6 +240,14 @@ static void read_msg_fd(void) read_loop(fd, buf, 4); redo_list_add(IVAL(buf,0)); break; + case MSG_SUCCESS: + if (len != 4) { + rprintf(FERROR, "invalid message %d:%d\n", tag, len); + exit_cleanup(RERR_STREAMIO); + } + read_loop(fd, buf, len); + io_multiplex_write(MSG_SUCCESS, buf, len); + break; case MSG_INFO: case MSG_ERROR: case MSG_LOG: @@ -673,6 +681,16 @@ static int readfd_unbuffered(int fd, cha read_loop(fd, iobuf_in, remaining); iobuf_in_ndx = 0; break; + case MSG_SUCCESS: + if (remaining != 4) { + rprintf(FERROR, "invalid multi-message %d:%ld\n", + tag, (long)remaining); + exit_cleanup(RERR_STREAMIO); + } + read_loop(fd, line, remaining); + successful_send(IVAL(line, 0)); + remaining = 0; + break; case MSG_INFO: case MSG_ERROR: if (remaining >= sizeof line) { --- orig/main.c 2004-07-24 16:52:09 +++ main.c 2004-07-22 03:06:20 @@ -42,6 +42,7 @@ extern int list_only; extern int local_server; extern int log_got_error; extern int module_id; +extern int need_messages_from_generator; extern int orig_umask; extern int keep_dirlinks; extern int preserve_hard_links; @@ -611,6 +612,8 @@ void start_server(int f_in, int f_out, i if (am_sender) { keep_dirlinks = 0; /* Must be disabled on the sender. */ + if (need_messages_from_generator) + io_start_multiplex_in(f_in); recv_exclude_list(f_in); if (cvs_exclude) @@ -682,6 +685,9 @@ int client_run(int f_in, int f_out, pid_ exit_cleanup(status); } + if (need_messages_from_generator && !read_batch) + io_start_multiplex_out(f_out); + if (argc == 0) list_only = 1; --- orig/options.c 2004-07-23 17:16:13 +++ 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 need_messages_from_generator = 0; int max_delete = 0; int ignore_errors = 0; int modify_window = 0; @@ -265,6 +267,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-sent-files updated/sent files are removed from sending side\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"); @@ -315,8 +318,8 @@ void usage(enum logcode F) } enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, - OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST, - OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, + OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_DELETE_SENT_FILES, + OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_LINK_DEST, OPT_MODIFY_WINDOW, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_REFUSED_BASE = 9000}; @@ -335,6 +338,7 @@ static struct poptOption long_options[] {"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 }, + {"delete-sent-files",0, POPT_ARG_NONE, 0, OPT_DELETE_SENT_FILES, 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 }, @@ -521,6 +525,11 @@ int parse_arguments(int *argc, const cha delete_mode = 1; break; + case OPT_DELETE_SENT_FILES: + delete_sent_files = 1; + need_messages_from_generator = 1; + break; + case OPT_EXCLUDE: if (am_server || sanitize_paths) return 0; /* Impossible... */ @@ -1025,6 +1034,9 @@ void server_options(char **args,int *arg } } + if (delete_sent_files) + args[ac++] = "--delete-sent-files"; + *argc = ac; return; --- orig/receiver.c 2004-07-23 17:16:13 +++ receiver.c 2004-07-26 06:21:43 @@ -45,6 +45,7 @@ extern char *backup_dir; extern char *backup_suffix; extern int backup_suffix_len; extern int cleanup_got_literal; +extern int delete_sent_files; extern int module_id; extern int ignore_errors; extern int orig_umask; @@ -338,7 +339,7 @@ int recv_files(int f_in, struct file_lis char *fname, fbuf[MAXPATHLEN]; char template[MAXPATHLEN]; char fnametmp[MAXPATHLEN]; - char *fnamecmp; + char *fnamecmp, numbuf[4]; char fnamecmpbuf[MAXPATHLEN]; struct file_struct *file; struct stats initial_stats; @@ -551,7 +552,12 @@ int recv_files(int f_in, struct file_lis cleanup_disable(); - if (!recv_ok) { + if (recv_ok) { + if (delete_sent_files) { + SIVAL(numbuf, 0, i); + send_msg(MSG_SUCCESS, numbuf, 4); + } + } else { int msgtype = csum_length == SUM_LENGTH || read_batch ? FERROR : FINFO; if (msgtype == FERROR || verbose) { @@ -570,9 +576,8 @@ int recv_files(int f_in, struct file_lis errstr, fname, keptstr, redostr); } if (csum_length != SUM_LENGTH) { - char buf[4]; - SIVAL(buf, 0, i); - send_msg(MSG_REDO, buf, 4); + SIVAL(numbuf, 0, i); + send_msg(MSG_REDO, numbuf, 4); } } } --- orig/rsync.h 2004-07-23 17:16:13 +++ rsync.h 2004-07-03 20:17:10 @@ -60,6 +60,7 @@ #define FLAG_TOP_DIR (1<<0) #define FLAG_HLINK_EOL (1<<1) /* generator only */ #define FLAG_MOUNT_POINT (1<<2) /* sender only */ +#define FLAG_SENT (1<<7) /* sender only */ /* update this if you make incompatible changes */ #define PROTOCOL_VERSION 28 @@ -123,6 +124,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3 /* Messages types that are sent over the message channel. The logcode * values must all be present here with identical numbers. */ enum msgcode { + MSG_SUCCESS=6, /* successfully updated indicated flist index */ 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 */ --- orig/rsync.yo 2004-07-24 16:52:10 +++ rsync.yo 2004-07-03 20:17:10 @@ -314,6 +314,7 @@ verb( --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-sent-files updated/sent files are removed from sender --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 @@ -618,6 +619,11 @@ receiving side before transferring files sufficient space on the receiving filesystem. If you want to delete after transferring, use the --delete-after switch. Implies --delete. +dit(bf(--delete-sent-files)) This tells rsync to remove the source files +on the sending side that are successfully transferred to the receiving +side. Directories are not removed, nor are files that are identical on +both systems. + dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files even when there are I/O errors. --- orig/sender.c 2004-07-20 21:36:08 +++ sender.c 2004-07-16 20:10:19 @@ -26,6 +26,7 @@ extern int io_error; extern int dry_run; extern int am_server; extern int am_daemon; +extern int delete_sent_files; extern int protocol_version; extern struct stats stats; @@ -107,7 +108,29 @@ static struct sum_struct *receive_sums(i return s; } +static struct file_list *the_flist; +void successful_send(int i) +{ + char fname[MAXPATHLEN]; + struct file_struct *file; + unsigned int offset; + + if (!the_flist) + return; + + file = the_flist->files[i]; + if (!(file->flags & FLAG_SENT)) + return; /* We didn't send it -- impossible! */ + if (file->basedir) { + offset = stringjoin(fname, sizeof fname, + file->basedir, "/", NULL); + } else + offset = 0; + f_name_to(file, fname + offset); + if (delete_sent_files && do_unlink(fname) == 0 && verbose > 0) + rprintf(FINFO, "sender removed %s\n", fname + offset); +} void send_files(struct file_list *flist, int f_out, int f_in) { @@ -125,6 +148,8 @@ void send_files(struct file_list *flist, if (verbose > 2) rprintf(FINFO, "send_files starting\n"); + the_flist = flist; + while (1) { unsigned int offset; @@ -246,6 +271,9 @@ void send_files(struct file_list *flist, if (verbose > 2) rprintf(FINFO, "sender finished %s\n", fname); + + /* Flag that we actually sent this entry. */ + file->flags |= FLAG_SENT; } if (verbose > 2)