---- 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 22 Feb 2004 08:56:43 -0000 1.139
-+++ options.c 23 Feb 2004 18:16:25 -0000
-@@ -82,6 +82,7 @@ int copy_unsafe_links = 0;
+--- 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;
int delete_after = 0;
int only_existing = 0;
int opt_ignore_existing = 0;
int max_delete = 0;
-@@ -89,6 +90,7 @@ int ignore_errors = 0;
+@@ -91,6 +92,7 @@ int ignore_errors = 0;
int modify_window = 0;
int blocking_io = -1;
int checksum_seed = 0;
unsigned int block_size = 0;
-@@ -252,6 +254,7 @@ void usage(enum logcode F)
+@@ -254,6 +256,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," --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");
-@@ -301,8 +304,8 @@ void usage(enum logcode F)
+@@ -303,8 +306,8 @@ void usage(enum logcode F)
}
enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
OPT_READ_BATCH, OPT_WRITE_BATCH,
OPT_REFUSED_BASE = 9000};
-@@ -321,6 +324,7 @@ static struct poptOption long_options[]
+@@ -323,6 +326,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 },
{"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 },
-@@ -506,6 +510,11 @@ int parse_arguments(int *argc, const cha
+@@ -509,6 +513,11 @@ int parse_arguments(int *argc, const cha
delete_mode = 1;
break;
+ break;
+
case OPT_EXCLUDE:
- add_exclude(&exclude_list, poptGetOptArg(pc),
- ADD_EXCLUDE);
-@@ -945,6 +954,9 @@ void server_options(char **args,int *arg
+ add_exclude(&exclude_list, poptGetOptArg(pc), 0);
+ break;
+@@ -964,6 +973,9 @@ void server_options(char **args,int *arg
args[ac++] = "--from0";
}
}
*argc = ac;
return;
---- proto.h 17 Feb 2004 23:13:06 -0000 1.184
-+++ proto.h 23 Feb 2004 18:16:25 -0000
-@@ -199,6 +199,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 10 Feb 2004 17:28:59 -0000 1.72
-+++ receiver.c 23 Feb 2004 18:16:26 -0000
-@@ -39,6 +39,7 @@ extern char *backup_dir;
- extern char *backup_suffix;
- extern int backup_suffix_len;
- extern int cleanup_got_literal;
+--- 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)
{
-@@ -288,7 +289,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.1 2 Feb 2004 18:23:09 -0000 1.163
-+++ rsync.1 23 Feb 2004 18:16:26 -0000
-@@ -349,6 +349,7 @@ to the detailed description below for a
- --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
-@@ -673,6 +674,12 @@ By default rsync does file deletions on
- 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\&.
-+.IP
-+.IP "\fB--delete-sent-files\fP"
-+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\&.
- .IP
- .IP "\fB--ignore-errors\fP"
- Tells --delete to go ahead and delete files
---- rsync.h 11 Feb 2004 08:01:21 -0000 1.186
-+++ rsync.h 23 Feb 2004 18:16:26 -0000
-@@ -59,6 +59,7 @@
+--- 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 */
#define FLAG_MOUNT_POINT (1<<2) /* sender 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 2 Feb 2004 18:23:09 -0000 1.147
-+++ rsync.yo 23 Feb 2004 18:16:27 -0000
+ 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
--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
-@@ -585,6 +586,11 @@ dit(bf(--delete-after)) By default rsync
+@@ -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