make proto
---- orig/io.c 2004-08-02 02:44:26
-+++ io.c 2004-07-03 20:17:10
-@@ -240,6 +240,14 @@ static void read_msg_fd(void)
+--- orig/io.c 2005-01-19 20:11:10
++++ io.c 2005-01-10 10:49:17
+@@ -244,6 +244,14 @@ static void read_msg_fd(void)
read_loop(fd, buf, 4);
redo_list_add(IVAL(buf,0));
break;
case MSG_INFO:
case MSG_ERROR:
case MSG_LOG:
-@@ -673,6 +681,16 @@ static int readfd_unbuffered(int fd, cha
+@@ -677,6 +685,16 @@ static int readfd_unbuffered(int fd, cha
read_loop(fd, iobuf_in, remaining);
iobuf_in_ndx = 0;
break;
case MSG_INFO:
case MSG_ERROR:
if (remaining >= sizeof line) {
---- orig/main.c 2004-07-31 16:41:04
-+++ main.c 2004-07-22 03:06:20
+--- orig/main.c 2005-01-17 23:11:45
++++ main.c 2004-08-13 08:24:23
@@ -42,6 +42,7 @@ extern int list_only;
extern int local_server;
extern int log_got_error;
extern int orig_umask;
extern int copy_links;
extern int keep_dirlinks;
-@@ -617,6 +618,8 @@ void start_server(int f_in, int f_out, i
+@@ -648,6 +649,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(f_in);
++ io_start_multiplex_in();
recv_exclude_list(f_in);
if (cvs_exclude)
-@@ -688,6 +691,9 @@ int client_run(int f_in, int f_out, pid_
+@@ -730,6 +733,9 @@ int client_run(int f_in, int f_out, pid_
exit_cleanup(status);
}
+ if (need_messages_from_generator && !read_batch)
-+ io_start_multiplex_out(f_out);
++ io_start_multiplex_out();
+
if (argc == 0)
list_only = 1;
---- orig/options.c 2004-08-03 15:41:32
-+++ options.c 2004-07-16 20:09:54
-@@ -88,8 +88,10 @@ int size_only = 0;
+--- 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;
int delete_after = 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;
- int modify_window = 0;
-@@ -267,6 +269,7 @@ void usage(enum logcode F)
+@@ -274,6 +276,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," --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," --max-delete=NUM don't delete more than NUM files\n");
- rprintf(F," --partial keep partially transferred files\n");
-@@ -318,8 +321,8 @@ void usage(enum logcode F)
- }
-
- enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
-- OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
-- OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
-+ OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_DELETE_SENT_FILES,
-+ OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_LINK_DEST, OPT_MODIFY_WINDOW,
- OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
- OPT_REFUSED_BASE = 9000};
-
-@@ -338,6 +341,7 @@ static struct poptOption long_options[]
+ 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 },
-+ {"delete-sent-files",0, POPT_ARG_NONE, 0, OPT_DELETE_SENT_FILES, 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 },
++ {"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 },
-@@ -537,6 +541,11 @@ int parse_arguments(int *argc, const cha
- delete_mode = 1;
- break;
+ {"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;
-+ case OPT_DELETE_SENT_FILES:
-+ delete_sent_files = 1;
-+ need_messages_from_generator = 1;
-+ break;
++ if (delete_sent_files)
++ need_messages_from_generator = 1;
+
- case OPT_EXCLUDE:
- if (am_server || sanitize_paths)
- return 0; /* Impossible... */
-@@ -1088,6 +1097,9 @@ void server_options(char **args,int *arg
- }
- }
+ *argv = poptGetArgs(pc);
+ *argc = count_args(*argv);
+
+@@ -1241,6 +1248,9 @@ void server_options(char **args,int *arg
+ if (!implied_dirs && !am_sender)
+ args[ac++] = "--no-implied-dirs";
+ if (delete_sent_files)
+ args[ac++] = "--delete-sent-files";
*argc = ac;
return;
---- orig/receiver.c 2004-08-03 15:34:32
-+++ receiver.c 2004-07-29 16:11:11
-@@ -45,6 +45,7 @@ extern char *backup_dir;
+--- orig/receiver.c 2005-01-21 00:35:26
++++ 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;
extern int cleanup_got_literal;
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
+@@ -322,7 +323,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
+@@ -568,7 +569,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
+@@ -592,9 +598,8 @@ int recv_files(int f_in, struct file_lis
keptstr, redostr);
}
if (csum_length != SUM_LENGTH) {
}
}
}
---- orig/rsync.h 2004-08-03 15:41:32
+--- orig/rsync.h 2005-01-21 00:35:26
+++ rsync.h 2004-07-03 20:17:10
@@ -60,6 +60,7 @@
- #define FLAG_TOP_DIR (1<<0)
+ #define FLAG_DEL_START (1<<0)
#define FLAG_HLINK_EOL (1<<1) /* generator only */
#define FLAG_MOUNT_POINT (1<<2) /* sender only */
+#define FLAG_SENT (1<<7) /* sender only */
/* update this if you make incompatible changes */
- #define PROTOCOL_VERSION 28
-@@ -126,6 +127,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
+ #define PROTOCOL_VERSION 29
+@@ -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 2004-08-03 15:34:32
+--- orig/rsync.yo 2005-01-20 19:47:08
+++ rsync.yo 2004-07-03 20:17:10
-@@ -314,6 +314,7 @@ verb(
+@@ -343,6 +343,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
+ --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
-@@ -625,6 +626,11 @@ receiving side before transferring files
- sufficient space on the receiving filesystem. If you want to delete
- after transferring, use the --delete-after switch. Implies --delete.
+ --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.
+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 2004-08-03 15:34:32
+--- orig/sender.c 2005-01-17 23:11:46
+++ 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 struct stats stats;
-
-@@ -107,7 +108,29 @@ static struct sum_struct *receive_sums(i
+ extern int updating_basis_file;
+ extern int make_backups;
+@@ -94,7 +95,29 @@ static struct sum_struct *receive_sums(i
return s;
}
+ struct file_struct *file;
+ unsigned int offset;
+
-+ if (!the_flist)
++ if (!the_flist || i < 0 || i >= the_flist->count)
+ return;
+
+ file = the_flist->files[i];
void send_files(struct file_list *flist, int f_out, int f_in)
{
-@@ -125,6 +148,8 @@ void send_files(struct file_list *flist,
+@@ -113,6 +136,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,
+@@ -248,6 +273,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)
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff