make proto
---- orig/io.c 2004-08-02 02:44:26
+--- orig/io.c 2004-11-03 20:30:45
+++ io.c 2004-07-03 20:17:10
@@ -240,6 +240,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 2004-10-08 20:16:26
+--- orig/main.c 2004-11-03 20:30:45
+++ main.c 2004-08-13 08:24:23
@@ -42,6 +42,7 @@ extern int list_only;
extern int local_server;
extern int orig_umask;
extern int copy_links;
extern int keep_dirlinks;
-@@ -621,6 +622,8 @@ void start_server(int f_in, int f_out, i
+@@ -634,6 +635,8 @@ void start_server(int f_in, int f_out, i
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
recv_exclude_list(f_in);
if (cvs_exclude)
-@@ -702,6 +705,9 @@ int client_run(int f_in, int f_out, pid_
+@@ -715,6 +718,9 @@ int client_run(int f_in, int f_out, pid_
exit_cleanup(status);
}
if (argc == 0)
list_only = 1;
---- orig/options.c 2004-10-14 17:11:40
+--- orig/options.c 2004-11-11 22:13:09
+++ options.c 2004-10-14 17:17:53
@@ -87,8 +87,10 @@ int size_only = 0;
int bwlimit = 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;
-@@ -266,6 +268,7 @@ void usage(enum logcode F)
+@@ -268,6 +270,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");
-@@ -310,8 +313,8 @@ void usage(enum logcode F)
+ rprintf(F," --max-size=SIZE don't transfer any file larger than SIZE\n");
+@@ -313,8 +316,8 @@ void usage(enum logcode F)
}
enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
- 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_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
OPT_REFUSED_BASE = 9000};
-@@ -330,6 +333,7 @@ static struct poptOption long_options[]
+@@ -333,6 +336,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 },
-@@ -606,6 +610,11 @@ int parse_arguments(int *argc, const cha
+@@ -610,6 +614,11 @@ int parse_arguments(int *argc, const cha
delete_mode = 1;
break;
case OPT_EXCLUDE:
add_exclude(&exclude_list, poptGetOptArg(pc), 0);
break;
-@@ -1156,6 +1165,9 @@ void server_options(char **args,int *arg
+@@ -1194,6 +1203,9 @@ void server_options(char **args,int *arg
}
}
*argc = ac;
return;
---- orig/receiver.c 2004-09-21 09:40:27
+--- orig/receiver.c 2004-11-03 20:30:45
+++ receiver.c 2004-08-13 08:38:51
-@@ -45,6 +45,7 @@ extern char *backup_dir;
+@@ -46,6 +46,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;
-@@ -337,7 +338,7 @@ int recv_files(int f_in, struct file_lis
+@@ -339,7 +340,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;
-@@ -572,7 +573,12 @@ int recv_files(int f_in, struct file_lis
+@@ -579,7 +580,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) {
-@@ -596,9 +602,8 @@ int recv_files(int f_in, struct file_lis
+@@ -603,9 +609,8 @@ int recv_files(int f_in, struct file_lis
keptstr, redostr);
}
if (csum_length != SUM_LENGTH) {
}
}
}
---- orig/rsync.h 2004-10-09 03:21:56
+--- orig/rsync.h 2004-11-03 20:30:45
+++ rsync.h 2004-07-03 20:17:10
@@ -60,6 +60,7 @@
#define FLAG_TOP_DIR (1<<0)
/* update this if you make incompatible changes */
#define PROTOCOL_VERSION 28
-@@ -127,6 +128,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
+@@ -132,6 +133,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-10-06 00:12:16
+--- orig/rsync.yo 2004-11-11 22:13:11
+++ rsync.yo 2004-07-03 20:17:10
@@ -343,6 +343,7 @@ verb(
--delete delete files that don't exist on sender
+ --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
-@@ -661,6 +662,11 @@ receiving side before transferring files
+ --max-size=SIZE don't transfer any file larger than SIZE
+@@ -667,6 +668,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.