make proto
---- orig/io.c 2004-11-25 16:32:40
-+++ io.c 2004-07-03 20:17:10
+--- orig/io.c 2005-01-14 18:30:18
++++ io.c 2005-01-10 10:49:17
@@ -243,6 +243,14 @@ static void read_msg_fd(void)
read_loop(fd, buf, 4);
redo_list_add(IVAL(buf,0));
case MSG_INFO:
case MSG_ERROR:
if (remaining >= sizeof line) {
---- orig/main.c 2004-11-27 17:53:24
+--- orig/main.c 2005-01-14 18:30:18
+++ main.c 2004-08-13 08:24:23
@@ -42,6 +42,7 @@ extern int list_only;
extern int local_server;
if (argc == 0)
list_only = 1;
---- orig/options.c 2004-11-27 17:53:24
-+++ options.c 2004-11-27 18:04:22
+--- orig/options.c 2005-01-15 04:40:15
++++ options.c 2005-01-10 10:46:47
@@ -88,8 +88,10 @@ int daemon_bwlimit = 0;
int bwlimit = 0;
size_t bwlimit_writemax = 0;
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," --max-size=SIZE don't transfer any file larger than SIZE\n");
-@@ -319,7 +322,7 @@ void usage(enum logcode F)
- }
-
- enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
-- OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED,
-+ OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_DELETE_SENT_FILES,
- OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
- OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
- OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, OPT_MAX_SIZE,
-@@ -340,6 +343,7 @@ static struct poptOption long_options[]
+@@ -341,6 +344,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-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 },
-@@ -621,6 +625,11 @@ int parse_arguments(int *argc, const cha
- delete_mode = 1;
- break;
+@@ -854,6 +858,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:
- add_exclude(&exclude_list, poptGetOptArg(pc), 0);
- break;
-@@ -1237,6 +1246,9 @@ void server_options(char **args,int *arg
- }
+ *argv = poptGetArgs(pc);
+ *argc = count_args(*argv);
+
+@@ -1240,6 +1247,9 @@ void server_options(char **args,int *arg
+ args[ac++] = "--no-relative";
}
+ if (delete_sent_files)
*argc = ac;
return;
---- orig/receiver.c 2004-11-27 17:57:31
+--- orig/receiver.c 2005-01-10 09:46:01
+++ receiver.c 2004-08-13 08:38:51
@@ -46,6 +46,7 @@ extern char *backup_dir;
extern char *backup_suffix;
extern int module_id;
extern int ignore_errors;
extern int orig_umask;
-@@ -339,7 +340,7 @@ int recv_files(int f_in, struct file_lis
+@@ -342,7 +343,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;
-@@ -580,7 +581,12 @@ int recv_files(int f_in, struct file_lis
+@@ -583,7 +584,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) {
-@@ -604,9 +610,8 @@ int recv_files(int f_in, struct file_lis
+@@ -607,9 +613,8 @@ int recv_files(int f_in, struct file_lis
keptstr, redostr);
}
if (csum_length != SUM_LENGTH) {
}
}
}
---- orig/rsync.h 2004-11-27 17:53:24
+--- orig/rsync.h 2005-01-10 00:21:12
+++ rsync.h 2004-07-03 20:17:10
@@ -60,6 +60,7 @@
#define FLAG_TOP_DIR (1<<0)
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-11-27 17:53:24
+--- orig/rsync.yo 2005-01-15 04:36:32
+++ rsync.yo 2004-07-03 20:17:10
@@ -343,6 +343,7 @@ verb(
--delete delete files that don't exist on sender
--ignore-errors delete even if there are I/O errors
--max-delete=NUM don't delete more than NUM files
--max-size=SIZE don't transfer any file larger than SIZE
-@@ -675,6 +676,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.
+@@ -693,6 +694,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-09-20 05:10:48
+--- orig/sender.c 2005-01-01 21:11:01
+++ sender.c 2004-07-26 16:49:19
@@ -26,6 +26,7 @@ extern int io_error;
extern int dry_run;
+ 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];
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff