make proto
---- orig/io.c 2005-01-19 20:11:10
+--- 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);
case MSG_INFO:
case MSG_ERROR:
if (remaining >= sizeof line) {
---- orig/main.c 2005-01-24 01:43:10
-+++ main.c 2004-08-13 08:24:23
-@@ -43,6 +43,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;
-@@ -649,6 +650,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. */
+ io_start_multiplex_in();
recv_filter_list(f_in);
- if (cvs_exclude)
-@@ -731,6 +734,9 @@ int client_run(int f_in, int f_out, pid_
+ 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 (argc == 0)
list_only |= 1;
---- orig/options.c 2005-01-25 03:26:51
+--- 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 one_file_system = 0;
int protocol_version = PROTOCOL_VERSION;
int sparse_files = 0;
-@@ -94,6 +95,7 @@ int bwlimit = 0;
+@@ -92,6 +93,7 @@ int bwlimit = 0;
size_t bwlimit_writemax = 0;
int only_existing = 0;
int opt_ignore_existing = 0;
int max_delete = 0;
OFF_T max_size = 0;
int ignore_errors = 0;
-@@ -282,6 +284,7 @@ void usage(enum logcode F)
+@@ -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," --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");
-@@ -354,6 +357,7 @@ static struct poptOption long_options[]
+@@ -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 },
{"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 },
{"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
{"filter", 'f', POPT_ARG_STRING, 0, OPT_FILTER, 0, 0 },
-@@ -905,6 +909,9 @@ int parse_arguments(int *argc, const cha
+@@ -922,6 +926,9 @@ int parse_arguments(int *argc, const cha
else if (delete_mode || delete_excluded)
delete_mode = delete_before = 1;
*argv = poptGetArgs(pc);
*argc = count_args(*argv);
-@@ -1293,6 +1300,9 @@ void server_options(char **args,int *arg
+@@ -1318,6 +1325,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-24 01:43:10
+--- orig/receiver.c 2005-02-03 02:04:20
+++ receiver.c 2004-08-13 08:38:51
-@@ -42,6 +42,7 @@ extern int basis_dir_cnt;
+@@ -41,6 +41,7 @@ extern int basis_dir_cnt;
extern int make_backups;
extern int do_progress;
extern int cleanup_got_literal;
extern int module_id;
extern int ignore_errors;
extern int orig_umask;
-@@ -270,7 +271,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, *partialptr;
+ char *fnamecmp, *partialptr, numbuf[4];
char fnamecmpbuf[MAXPATHLEN];
+ uchar *delayed_bits = NULL;
struct file_struct *file;
- struct stats initial_stats;
-@@ -516,7 +517,12 @@ int recv_files(int f_in, struct file_lis
+@@ -532,7 +533,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) {
-@@ -540,9 +546,8 @@ int recv_files(int f_in, struct file_lis
+@@ -556,9 +562,8 @@ int recv_files(int f_in, struct file_lis
keptstr, redostr);
}
if (csum_length != SUM_LENGTH) {
}
}
}
---- 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)
+--- 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 29
-@@ -144,6 +145,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
+@@ -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 2005-01-25 03:26:51
-+++ rsync.yo 2005-01-23 07:31:03
-@@ -347,6 +347,7 @@ verb(
+--- 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
--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
-@@ -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.
+@@ -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 2005-01-25 00:00:31
+--- 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;
while (1) {
unsigned int offset;
-@@ -249,6 +274,9 @@ void send_files(struct file_list *flist,
+@@ -254,6 +279,9 @@ void send_files(struct file_list *flist,
rprintf(FINFO, "sender finished %s\n",
safe_fname(fname));
}
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff