case MSG_INFO:
case MSG_ERROR:
if (remaining >= sizeof line) {
---- orig/main.c 2004-08-05 18:24:21
+--- orig/main.c 2004-09-18 01:49:33
+++ main.c 2004-08-13 08:24:23
@@ -42,6 +42,7 @@ extern int list_only;
extern int local_server;
if (argc == 0)
list_only = 1;
---- orig/options.c 2004-08-12 18:34:38
+--- orig/options.c 2004-09-20 05:10:48
+++ options.c 2004-07-16 20:09:54
@@ -87,8 +87,10 @@ int size_only = 0;
int bwlimit = 0;
+ break;
+
case OPT_EXCLUDE:
- if (am_server || sanitize_paths)
- return 0; /* Impossible... */
-@@ -1090,6 +1099,9 @@ void server_options(char **args,int *arg
+ add_exclude(&exclude_list, poptGetOptArg(pc), 0);
+ break;
+@@ -1095,6 +1104,9 @@ void server_options(char **args,int *arg
}
}
*argc = ac;
return;
---- orig/receiver.c 2004-08-03 15:34:32
+--- orig/receiver.c 2004-09-21 09:40:27
+++ receiver.c 2004-08-13 08:38:51
@@ -45,6 +45,7 @@ extern char *backup_dir;
extern char *backup_suffix;
extern int module_id;
extern int ignore_errors;
extern int orig_umask;
-@@ -341,7 +342,7 @@ int recv_files(int f_in, struct file_lis
+@@ -337,7 +338,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;
-@@ -571,7 +572,12 @@ int recv_files(int f_in, struct file_lis
+@@ -572,7 +573,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) {
-@@ -595,9 +601,8 @@ int recv_files(int f_in, struct file_lis
+@@ -596,9 +602,8 @@ int recv_files(int f_in, struct file_lis
keptstr, redostr);
}
if (csum_length != SUM_LENGTH) {
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-08-13 07:18:59
+--- orig/rsync.yo 2004-09-20 05:10:48
+++ rsync.yo 2004-07-03 20:17:10
@@ -343,6 +343,7 @@ verb(
--delete delete files that don't exist on sender
dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
even when there are I/O errors.
---- orig/sender.c 2004-08-03 15:34:32
+--- orig/sender.c 2004-09-20 05:10:48
+++ sender.c 2004-07-26 16:49:19
@@ -26,6 +26,7 @@ extern int io_error;
extern int dry_run;
extern int am_daemon;
+extern int delete_sent_files;
extern int protocol_version;
+ extern int make_backups;
extern struct stats stats;
-
-@@ -107,7 +108,29 @@ static struct sum_struct *receive_sums(i
+@@ -108,7 +109,29 @@ static struct sum_struct *receive_sums(i
return s;
}
void send_files(struct file_list *flist, int f_out, int f_in)
{
-@@ -125,6 +148,8 @@ void send_files(struct file_list *flist,
+@@ -127,6 +150,8 @@ void send_files(struct file_list *flist,
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
while (1) {
unsigned int offset;
-@@ -252,6 +277,9 @@ void send_files(struct file_list *flist,
+@@ -257,6 +282,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)