Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix failing hunks.
[rsync/rsync-patches.git]
/
remove-sent-files.diff
diff --git
a/remove-sent-files.diff
b/remove-sent-files.diff
index
b500575
..
5bd4061
100644
(file)
--- a/
remove-sent-files.diff
+++ b/
remove-sent-files.diff
@@
-129,7
+129,7
@@
command before "make":
*argc = ac;
return;
*argc = ac;
return;
---- orig/receiver.c 2004-07-2
3 17:16:13
+--- orig/receiver.c 2004-07-2
6 16:20:00
+++ receiver.c 2004-07-26 06:21:43
@@ -45,6 +45,7 @@ extern char *backup_dir;
extern char *backup_suffix;
+++ receiver.c 2004-07-26 06:21:43
@@ -45,6 +45,7 @@ extern char *backup_dir;
extern char *backup_suffix;
@@
-139,7
+139,7
@@
command before "make":
extern int module_id;
extern int ignore_errors;
extern int orig_umask;
extern int module_id;
extern int ignore_errors;
extern int orig_umask;
-@@ -3
38,7 +339
,7 @@ int recv_files(int f_in, struct file_lis
+@@ -3
42,7 +343
,7 @@ int recv_files(int f_in, struct file_lis
char *fname, fbuf[MAXPATHLEN];
char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
char *fname, fbuf[MAXPATHLEN];
char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
@@
-148,7
+148,7
@@
command before "make":
char fnamecmpbuf[MAXPATHLEN];
struct file_struct *file;
struct stats initial_stats;
char fnamecmpbuf[MAXPATHLEN];
struct file_struct *file;
struct stats initial_stats;
-@@ -55
1,7 +552
,12 @@ int recv_files(int f_in, struct file_lis
+@@ -55
5,7 +556
,12 @@ int recv_files(int f_in, struct file_lis
cleanup_disable();
cleanup_disable();
@@
-162,8
+162,8
@@
command before "make":
int msgtype = csum_length == SUM_LENGTH || read_batch ?
FERROR : FINFO;
if (msgtype == FERROR || verbose) {
int msgtype = csum_length == SUM_LENGTH || read_batch ?
FERROR : FINFO;
if (msgtype == FERROR || verbose) {
-@@ -57
0,9 +576
,8 @@ int recv_files(int f_in, struct file_lis
-
errstr, fname,
keptstr, redostr);
+@@ -57
5,9 +581
,8 @@ int recv_files(int f_in, struct file_lis
+ keptstr, redostr);
}
if (csum_length != SUM_LENGTH) {
- char buf[4];
}
if (csum_length != SUM_LENGTH) {
- char buf[4];
@@
-214,8
+214,8
@@
command before "make":
dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
even when there are I/O errors.
dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
even when there are I/O errors.
---- orig/sender.c 2004-07-2
0 21:36:08
-+++ sender.c 2004-07-
16 20:10
:19
+--- orig/sender.c 2004-07-2
6 16:27:00
++++ sender.c 2004-07-
26 16:49
:19
@@ -26,6 +26,7 @@ extern int io_error;
extern int dry_run;
extern int am_server;
@@ -26,6 +26,7 @@ extern int io_error;
extern int dry_run;
extern int am_server;
@@
-263,10
+263,10
@@
command before "make":
while (1) {
unsigned int offset;
while (1) {
unsigned int offset;
-@@ -24
6,6 +271
,9 @@ void send_files(struct file_list *flist,
-
- if (verbose > 2)
- rprintf(FINFO, "sender finished %s\n", fname);
+@@ -24
8,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;
+
+ /* Flag that we actually sent this entry. */
+ file->flags |= FLAG_SENT;