---- io.c 16 Jan 2004 16:31:47 -0000 1.119
-+++ io.c 23 Feb 2004 18:16:25 -0000
+After applying this patch and running configure, you MUST run this
+command before "make":
+
+ make proto
+
+
+--- io.c 15 May 2004 19:31:10 -0000 1.121
++++ io.c 15 May 2004 20:15:14 -0000
@@ -222,6 +222,14 @@ static void read_msg_fd(void)
read_loop(fd, buf, 4);
redo_list_add(IVAL(buf,0));
case MSG_INFO:
case MSG_ERROR:
case MSG_LOG:
-@@ -637,6 +645,16 @@ static int read_unbuffered(int fd, char
+@@ -635,6 +643,16 @@ static int read_unbuffered(int fd, char
}
read_loop(fd, buffer, remaining);
bufferIdx = 0;
break;
case MSG_INFO:
case MSG_ERROR:
---- main.c 10 Feb 2004 03:54:47 -0000 1.192
-+++ main.c 23 Feb 2004 18:16:25 -0000
+--- main.c 15 May 2004 19:31:10 -0000 1.194
++++ main.c 15 May 2004 20:15:15 -0000
@@ -42,6 +42,7 @@ extern int list_only;
extern int local_server;
extern int log_got_error;
extern int orig_umask;
extern int preserve_hard_links;
extern int protocol_version;
-@@ -567,6 +568,8 @@ void start_server(int f_in, int f_out, i
+@@ -566,6 +567,8 @@ void start_server(int f_in, int f_out, i
io_start_multiplex_out(f_out);
if (am_sender) {
if (!read_batch) {
recv_exclude_list(f_in);
if (cvs_exclude)
-@@ -632,6 +635,9 @@ int client_run(int f_in, int f_out, pid_
+@@ -631,6 +634,9 @@ int client_run(int f_in, int f_out, pid_
io_flush(FULL_FLUSH);
exit_cleanup(status);
}
+ if (need_messages_from_generator)
+ io_start_multiplex_out(f_out);
- if (argc == 0) {
+ if (argc == 0)
list_only = 1;
---- options.c 14 Apr 2004 23:33:34 -0000 1.146
-+++ options.c 15 Apr 2004 19:11:00 -0000
+--- options.c 6 May 2004 21:08:01 -0000 1.148
++++ options.c 15 May 2004 20:15:15 -0000
@@ -84,6 +84,7 @@ int copy_unsafe_links = 0;
int size_only = 0;
int bwlimit = 0;
*argc = ac;
return;
---- proto.h 14 Apr 2004 23:33:30 -0000 1.188
-+++ proto.h 15 Apr 2004 19:11:00 -0000
-@@ -198,6 +198,7 @@ void sig_int(void);
- void finish_transfer(char *fname, char *fnametmp, struct file_struct *file);
- const char *who_am_i(void);
- void read_sum_head(int f, struct sum_struct *sum);
-+void successful_send(int i);
- void send_files(struct file_list *flist, int f_out, int f_in);
- int try_bind_local(int s, int ai_family, int ai_socktype,
- const char *bind_address);
---- receiver.c 23 Mar 2004 16:50:40 -0000 1.75
-+++ receiver.c 15 Apr 2004 19:11:01 -0000
-@@ -45,6 +45,7 @@ extern int cleanup_got_literal;
- extern int module_id;
+--- receiver.c 15 May 2004 19:31:10 -0000 1.78
++++ receiver.c 15 May 2004 20:15:15 -0000
+@@ -46,6 +46,7 @@ extern int module_id;
extern int ignore_errors;
extern int orig_umask;
+ extern int keep_partial;
+extern int delete_sent_files;
static void delete_one(char *fn, int is_dir)
{
-@@ -292,7 +293,7 @@ int recv_files(int f_in,struct file_list
+@@ -294,7 +295,7 @@ int recv_files(int f_in,struct file_list
char *fname, fbuf[MAXPATHLEN];
char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
char fnamecmpbuf[MAXPATHLEN];
struct map_struct *mapbuf;
int i;
-@@ -467,16 +468,20 @@ int recv_files(int f_in,struct file_list
+@@ -476,16 +477,20 @@ int recv_files(int f_in,struct file_list
cleanup_disable();
}
}
}
---- rsync.h 14 Apr 2004 23:33:37 -0000 1.196
-+++ rsync.h 15 Apr 2004 19:11:02 -0000
+--- rsync.h 13 May 2004 18:51:22 -0000 1.203
++++ rsync.h 15 May 2004 20:15:15 -0000
@@ -60,6 +60,7 @@
#define FLAG_TOP_DIR (1<<0)
#define FLAG_HLINK_EOL (1<<1) /* generator only */
/* update this if you make incompatible changes */
#define PROTOCOL_VERSION 28
-@@ -124,6 +125,7 @@ enum msgcode {
- MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
- MSG_REDO=4, /* reprocess indicated flist index */
- MSG_DONE=5, /* current phase is done */
+@@ -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 */
- };
-
- #include "errcode.h"
---- rsync.yo 15 Apr 2004 18:32:24 -0000 1.157
-+++ rsync.yo 15 Apr 2004 19:11:02 -0000
-@@ -312,6 +312,7 @@
+ 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 */
+--- rsync.yo 7 May 2004 00:18:37 -0000 1.169
++++ rsync.yo 15 May 2004 20:15:16 -0000
+@@ -312,6 +312,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
--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
-@@ -587,6 +588,11 @@
+@@ -596,6 +597,11 @@ dit(bf(--delete-after)) By default rsync
receiving side before transferring files to try to ensure that there is
sufficient space on the receiving filesystem. If you want to delete
after transferring, use the --delete-after switch. Implies --delete.
dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
even when there are I/O errors.
---- sender.c 17 Feb 2004 21:57:44 -0000 1.38
-+++ sender.c 23 Feb 2004 18:16:27 -0000
+--- sender.c 15 May 2004 19:31:10 -0000 1.40
++++ sender.c 15 May 2004 20:15:16 -0000
@@ -27,6 +27,7 @@ extern int dry_run;
extern int am_server;
extern int am_daemon;
while (1) {
unsigned int offset;
-@@ -302,6 +327,9 @@ void send_files(struct file_list *flist,
+@@ -300,6 +325,9 @@ void send_files(struct file_list *flist,
if (verbose > 2)
rprintf(FINFO, "sender finished %s\n", fname);
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff