make proto
---- orig/io.c 2004-07-20 21:36:07
-+++ io.c 2004-07-03 20:17:10
-@@ -239,6 +239,14 @@ static void read_msg_fd(void)
+--- orig/io.c 2005-02-03 02:04:20
++++ io.c 2005-01-10 10:49:17
+@@ -244,6 +244,14 @@ static void read_msg_fd(void)
read_loop(fd, buf, 4);
redo_list_add(IVAL(buf,0));
break;
case MSG_INFO:
case MSG_ERROR:
case MSG_LOG:
-@@ -672,6 +680,16 @@ static int readfd_unbuffered(int fd, cha
+@@ -677,6 +685,16 @@ static int readfd_unbuffered(int fd, cha
read_loop(fd, iobuf_in, remaining);
iobuf_in_ndx = 0;
break;
case MSG_INFO:
case MSG_ERROR:
if (remaining >= sizeof line) {
---- orig/main.c 2004-07-19 17:14:44
-+++ main.c 2004-07-15 02:29:03
-@@ -42,6 +42,7 @@ extern int list_only;
- extern int local_server;
+--- orig/main.c 2005-02-04 22:28:09
++++ main.c 2005-02-05 01:24:16
+@@ -32,12 +32,14 @@ extern int am_daemon;
+ extern int verbose;
+ extern int blocking_io;
+ extern int delete_before;
++extern int delete_sent_files;
+ extern int daemon_over_rsh;
+ extern int do_stats;
+ extern int dry_run;
+ extern int list_only;
extern int log_got_error;
extern int module_id;
+extern int need_messages_from_generator;
extern int orig_umask;
+ extern int copy_links;
extern int keep_dirlinks;
- extern int preserve_hard_links;
-@@ -600,6 +601,8 @@ void start_server(int f_in, int f_out, i
+@@ -440,6 +442,12 @@ static void do_server_sender(int f_in, i
+ exit_cleanup(RERR_SYNTAX);
+ return;
+ }
++ if (am_daemon && lp_read_only(module_id) && delete_sent_files) {
++ rprintf(FERROR,
++ "ERROR: --delete-sent-files cannot be used with a read-only module\n");
++ exit_cleanup(RERR_SYNTAX);
++ return;
++ }
+
+ if (!relative_paths && !push_dir(dir)) {
+ rsyserr(FERROR, errno, "push_dir#3 %s failed",
+@@ -670,6 +678,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);
++ io_start_multiplex_in();
- recv_exclude_list(f_in);
- if (cvs_exclude)
-@@ -680,6 +683,9 @@ int client_run(int f_in, int f_out, pid_
+ recv_filter_list(f_in);
+ do_server_sender(f_in, f_out, argc, argv);
+@@ -747,6 +757,9 @@ int client_run(int f_in, int f_out, pid_
exit_cleanup(status);
}
-+ if (need_messages_from_generator)
-+ io_start_multiplex_out(f_out);
++ if (need_messages_from_generator && !read_batch)
++ io_start_multiplex_out();
+
if (argc == 0)
- list_only = 1;
+ list_only |= 1;
---- orig/options.c 2004-07-20 21:36:07
-+++ options.c 2004-07-16 20:09:54
-@@ -87,8 +87,10 @@ int size_only = 0;
- int bwlimit = 0;
- size_t bwlimit_writemax = 0;
+--- orig/options.c 2005-02-04 22:28:09
++++ options.c 2005-01-23 07:30:51
+@@ -59,6 +59,7 @@ int delete_during = 0;
+ int delete_before = 0;
int delete_after = 0;
+ int delete_excluded = 0;
+int delete_sent_files = 0;
+ int one_file_system = 0;
+ int protocol_version = PROTOCOL_VERSION;
+ int sparse_files = 0;
+@@ -92,6 +93,7 @@ int bwlimit = 0;
+ size_t bwlimit_writemax = 0;
int only_existing = 0;
int opt_ignore_existing = 0;
+int need_messages_from_generator = 0;
int max_delete = 0;
+ OFF_T max_size = 0;
int ignore_errors = 0;
- int modify_window = 0;
-@@ -264,6 +266,7 @@ void usage(enum logcode F)
- rprintf(F," --delete delete files that don't exist on the sending side\n");
+@@ -286,6 +288,7 @@ void usage(enum logcode F)
+ rprintf(F," --delete-during receiver deletes during transfer, not before\n");
+ rprintf(F," --delete-after receiver deletes after transfer, not before\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," --force force deletion of directories even if not empty\n");
rprintf(F," --max-delete=NUM don't delete more than NUM files\n");
- rprintf(F," --partial keep partially transferred files\n");
-@@ -314,8 +317,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};
-
-@@ -334,6 +337,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 },
+@@ -360,6 +363,7 @@ static struct poptOption long_options[]
+ {"delete-during", 0, POPT_ARG_NONE, &delete_during, 0, 0, 0 },
+ {"delete-after", 0, POPT_ARG_NONE, &delete_after, 0, 0, 0 },
+ {"delete-excluded", 0, POPT_ARG_NONE, &delete_excluded, 0, 0, 0 },
++ {"delete-sent-files",0, POPT_ARG_NONE, &delete_sent_files, 0, 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 },
-@@ -520,6 +524,11 @@ int parse_arguments(int *argc, const cha
- delete_mode = 1;
- break;
+ {"filter", 'f', POPT_ARG_STRING, 0, OPT_FILTER, 0, 0 },
+@@ -922,6 +926,9 @@ int parse_arguments(int *argc, const cha
+ else if (delete_mode || delete_excluded)
+ delete_mode = delete_before = 1;
-+ case OPT_DELETE_SENT_FILES:
-+ delete_sent_files = 1;
-+ need_messages_from_generator = 1;
-+ break;
++ if (delete_sent_files)
++ need_messages_from_generator = 1;
+
- case OPT_EXCLUDE:
- if (am_server || sanitize_paths)
- return 0; /* Impossible... */
-@@ -1019,6 +1028,9 @@ void server_options(char **args,int *arg
- }
- }
+ *argv = poptGetArgs(pc);
+ *argc = count_args(*argv);
+
+@@ -1318,6 +1325,9 @@ void server_options(char **args,int *arg
+ if (!implied_dirs && !am_sender)
+ args[ac++] = "--no-implied-dirs";
+ if (delete_sent_files)
+ args[ac++] = "--delete-sent-files";
*argc = ac;
return;
---- orig/receiver.c 2004-07-20 21:36:07
-+++ 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;
+--- orig/receiver.c 2005-02-03 02:04:20
++++ receiver.c 2004-08-13 08:38:51
+@@ -41,6 +41,7 @@ extern int basis_dir_cnt;
+ extern int make_backups;
+ extern int do_progress;
extern int cleanup_got_literal;
+extern int delete_sent_files;
extern int module_id;
extern int ignore_errors;
extern int orig_umask;
-@@ -335,7 +336,7 @@ int recv_files(int f_in, struct file_lis
+@@ -275,7 +276,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 *fnamecmp, *partialptr;
++ char *fnamecmp, *partialptr, numbuf[4];
char fnamecmpbuf[MAXPATHLEN];
+ uchar *delayed_bits = NULL;
struct file_struct *file;
- struct stats initial_stats;
-@@ -528,16 +529,20 @@ int recv_files(int f_in, struct file_lis
+@@ -532,7 +533,12 @@ int recv_files(int f_in, struct file_lis
cleanup_disable();
+ send_msg(MSG_SUCCESS, numbuf, 4);
+ }
+ } else {
- if (csum_length == SUM_LENGTH) {
- rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
- full_fname(fname));
- } else {
+ int msgtype = csum_length == SUM_LENGTH || read_batch ?
+ FERROR : FINFO;
+ if (msgtype == FERROR || verbose) {
+@@ -556,9 +562,8 @@ int recv_files(int f_in, struct file_lis
+ keptstr, redostr);
+ }
+ if (csum_length != SUM_LENGTH) {
- char buf[4];
- if (verbose > 1)
- rprintf(FINFO,"redoing %s(%d)\n",fname,i);
- SIVAL(buf, 0, i);
- send_msg(MSG_REDO, buf, 4);
+ SIVAL(numbuf, 0, i);
}
}
}
---- orig/rsync.h 2004-07-20 21:36:08
-+++ rsync.h 2004-07-03 20:17:10
-@@ -60,6 +60,7 @@
- #define FLAG_TOP_DIR (1<<0)
+--- orig/rsync.h 2005-02-04 22:28:09
++++ rsync.h 2005-02-03 02:04:59
+@@ -61,6 +61,7 @@
#define FLAG_HLINK_EOL (1<<1) /* generator only */
#define FLAG_MOUNT_POINT (1<<2) /* sender only */
+ #define FLAG_DEL_HERE (1<<3) /* receiver/generator */
+#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
+ #define PROTOCOL_VERSION 29
+@@ -142,6 +143,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_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-20 21:36:08
-+++ 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
+--- orig/rsync.yo 2005-02-05 01:23:49
++++ rsync.yo 2005-02-03 02:05:29
+@@ -338,6 +338,7 @@ to the detailed description below for a
+ --delete-during receiver deletes during xfer, not before
--delete-after receiver deletes after transfer, not before
+ --delete-excluded also delete excluded files on receiver
+ --delete-sent-files updated/sent files are removed from sender
--ignore-errors delete even if there are I/O errors
+ --force force deletion of dirs even if not empty
--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.
+@@ -727,6 +728,11 @@ receiving side that are not on the sendi
+ delete any files on the receiving side that are excluded (see bf(--exclude)).
+ See bf(--delete) (which is implied) for more details on file-deletion.
+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
+ dit(bf(--ignore-errors)) Tells bf(--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
+--- orig/sender.c 2005-02-03 02:04:20
++++ sender.c 2004-07-26 16:49: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
+ extern int updating_basis_file;
+ extern int make_backups;
+@@ -94,7 +95,29 @@ static struct sum_struct *receive_sums(i
return s;
}
+ struct file_struct *file;
+ unsigned int offset;
+
-+ if (!the_flist)
++ if (!the_flist || i < 0 || i >= the_flist->count)
+ return;
+
+ file = the_flist->files[i];
void send_files(struct file_list *flist, int f_out, int f_in)
{
-@@ -125,6 +148,8 @@ void send_files(struct file_list *flist,
+@@ -113,6 +136,8 @@ void send_files(struct file_list *flist,
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
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);
+@@ -254,6 +279,9 @@ void send_files(struct file_list *flist,
+ rprintf(FINFO, "sender finished %s\n",
+ safe_fname(fname));
+ }
+
+ /* Flag that we actually sent this entry. */
+ file->flags |= FLAG_SENT;
}
+ make_backups = save_make_backups;
- if (verbose > 2)