case MSG_INFO:
case MSG_ERROR:
if (remaining >= sizeof line) {
---- orig/main.c 2005-01-17 23:11:45
+--- orig/main.c 2005-01-24 01:43:10
+++ main.c 2004-08-13 08:24:23
-@@ -42,6 +42,7 @@ extern int list_only;
+@@ -43,6 +43,7 @@ extern int list_only;
extern int local_server;
extern int log_got_error;
extern int module_id;
extern int orig_umask;
extern int copy_links;
extern int keep_dirlinks;
-@@ -648,6 +649,8 @@ void start_server(int f_in, int f_out, i
+@@ -649,6 +650,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();
- recv_exclude_list(f_in);
+ recv_filter_list(f_in);
if (cvs_exclude)
-@@ -730,6 +733,9 @@ int client_run(int f_in, int f_out, pid_
+@@ -731,6 +734,9 @@ int client_run(int f_in, int f_out, pid_
exit_cleanup(status);
}
+ io_start_multiplex_out();
+
if (argc == 0)
- list_only = 1;
+ list_only |= 1;
---- orig/options.c 2005-01-20 23:05:34
-+++ options.c 2005-01-10 10:46:47
-@@ -89,8 +89,10 @@ int daemon_bwlimit = 0;
- int bwlimit = 0;
- size_t bwlimit_writemax = 0;
+--- orig/options.c 2005-01-25 03:26:51
++++ 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;
+@@ -94,6 +95,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;
-@@ -274,6 +276,7 @@ void usage(enum logcode F)
- rprintf(F," --delete delete files that don't exist on the sending side\n");
+@@ -282,6 +284,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," --max-size=SIZE don't transfer any file larger than SIZE\n");
-@@ -342,6 +345,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 },
+@@ -354,6 +357,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 },
-@@ -858,6 +862,9 @@ int parse_arguments(int *argc, const cha
- if (relative_paths < 0)
- relative_paths = files_from? 1 : 0;
+ {"filter", 'f', POPT_ARG_STRING, 0, OPT_FILTER, 0, 0 },
+@@ -905,6 +909,9 @@ int parse_arguments(int *argc, const cha
+ else if (delete_mode || delete_excluded)
+ delete_mode = delete_before = 1;
+ if (delete_sent_files)
+ need_messages_from_generator = 1;
*argv = poptGetArgs(pc);
*argc = count_args(*argv);
-@@ -1241,6 +1248,9 @@ void server_options(char **args,int *arg
+@@ -1293,6 +1300,9 @@ void server_options(char **args,int *arg
if (!implied_dirs && !am_sender)
args[ac++] = "--no-implied-dirs";
*argc = ac;
return;
---- orig/receiver.c 2005-01-21 00:35:26
+--- orig/receiver.c 2005-01-24 01:43:10
+++ receiver.c 2004-08-13 08:38:51
-@@ -47,6 +47,7 @@ extern char *backup_dir;
- extern char *backup_suffix;
- extern int backup_suffix_len;
+@@ -42,6 +42,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;
-@@ -322,7 +323,7 @@ int recv_files(int f_in, struct file_lis
+@@ -270,7 +271,7 @@ int recv_files(int f_in, struct file_lis
char *fname, fbuf[MAXPATHLEN];
char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
char fnamecmpbuf[MAXPATHLEN];
struct file_struct *file;
struct stats initial_stats;
-@@ -568,7 +569,12 @@ int recv_files(int f_in, struct file_lis
+@@ -516,7 +517,12 @@ int recv_files(int f_in, struct file_lis
cleanup_disable();
int msgtype = csum_length == SUM_LENGTH || read_batch ?
FERROR : FINFO;
if (msgtype == FERROR || verbose) {
-@@ -592,9 +598,8 @@ int recv_files(int f_in, struct file_lis
+@@ -540,9 +546,8 @@ int recv_files(int f_in, struct file_lis
keptstr, redostr);
}
if (csum_length != SUM_LENGTH) {
}
}
}
---- orig/rsync.h 2005-01-21 00:35:26
+--- orig/rsync.h 2005-01-25 00:53:58
+++ rsync.h 2004-07-03 20:17:10
@@ -60,6 +60,7 @@
#define FLAG_DEL_START (1<<0)
/* update this if you make incompatible changes */
#define PROTOCOL_VERSION 29
-@@ -142,6 +143,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
+@@ -144,6 +145,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 2005-01-20 19:47:08
-+++ rsync.yo 2004-07-03 20:17:10
-@@ -343,6 +343,7 @@ verb(
- --delete delete files that don't exist on sender
- --delete-excluded also delete excluded files on receiver
+--- orig/rsync.yo 2005-01-25 03:26:51
++++ rsync.yo 2005-01-23 07:31:03
+@@ -347,6 +347,7 @@ verb(
+ --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
- --max-size=SIZE don't transfer any file larger than SIZE
-@@ -695,6 +696,11 @@ One reason to use --delete-after is to a
- the transfer (while the receiving side is scanned for deletions) as this
- delay might cause the transfer to timeout.
+@@ -725,6 +726,11 @@ receiving side that are not on the sendi
+ delete any files on the receiving side that are excluded (see --exclude).
+ See --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
dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
even when there are I/O errors.
---- orig/sender.c 2005-01-17 23:11:46
+--- orig/sender.c 2005-01-25 00:00:31
+++ sender.c 2004-07-26 16:49:19
@@ -26,6 +26,7 @@ extern int io_error;
extern int dry_run;
while (1) {
unsigned int offset;
-@@ -248,6 +273,9 @@ void send_files(struct file_list *flist,
+@@ -249,6 +274,9 @@ void send_files(struct file_list *flist,
rprintf(FINFO, "sender finished %s\n",
safe_fname(fname));
}