Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9386e6b
)
Fixed some patch fuzz.
author
Wayne Davison
<wayned@samba.org>
Wed, 17 May 2006 06:30:59 +0000
(06:30 +0000)
committer
Wayne Davison
<wayned@samba.org>
Wed, 17 May 2006 06:30:59 +0000
(06:30 +0000)
threaded-receiver.diff
patch
|
blob
|
blame
|
history
diff --git
a/threaded-receiver.diff
b/threaded-receiver.diff
index
1442b3e
..
dc6a1c7
100644
(file)
--- a/
threaded-receiver.diff
+++ b/
threaded-receiver.diff
@@
-137,7
+137,7
@@
After applying this patch, run these commands for a successful build:
continue;
}
continue;
}
-@@ -118
7,7 +1191
,7 @@ static void recv_generator(char *fname,
+@@ -118
5,7 +1189
,7 @@ static void recv_generator(char *fname,
return;
}
return;
}
@@
-146,7
+146,7
@@
After applying this patch, run these commands for a successful build:
return;
if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
return;
if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
-@@ -124
2,7 +1246
,7 @@ static void recv_generator(char *fname,
+@@ -124
0,7 +1244
,7 @@ static void recv_generator(char *fname,
goto notify_others;
}
goto notify_others;
}
@@
-155,7
+155,7
@@
After applying this patch, run these commands for a successful build:
if (!(backupptr = get_backup_name(fname))) {
close(fd);
return;
if (!(backupptr = get_backup_name(fname))) {
close(fd);
return;
-@@ -133
3,9 +1337
,12 @@ void generate_files(int f_out, struct fi
+@@ -133
1,9 +1335
,12 @@ void generate_files(int f_out, struct fi
int save_ignore_existing = ignore_existing;
int save_ignore_non_existing = ignore_non_existing;
int save_do_progress = do_progress;
int save_ignore_existing = ignore_existing;
int save_ignore_non_existing = ignore_non_existing;
int save_do_progress = do_progress;
@@
-169,7
+169,7
@@
After applying this patch, run these commands for a successful build:
if (protocol_version >= 29) {
itemizing = 1;
maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
if (protocol_version >= 29) {
itemizing = 1;
maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
-@@ -136
3,7 +1370
,7 @@ void generate_files(int f_out, struct fi
+@@ -136
1,7 +1368
,7 @@ void generate_files(int f_out, struct fi
do_delete_pass(flist);
do_progress = 0;
do_delete_pass(flist);
do_progress = 0;
@@
-178,7
+178,7
@@
After applying this patch, run these commands for a successful build:
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -137
2,12 +1379
,6 @@ void generate_files(int f_out, struct fi
+@@ -137
0,12 +1377
,6 @@ void generate_files(int f_out, struct fi
: "enabled");
}
: "enabled");
}
@@
-191,7
+191,7
@@
After applying this patch, run these commands for a successful build:
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
-@@ -14
21,23 +1422
,34 @@ void generate_files(int f_out, struct fi
+@@ -14
19,23 +1420
,34 @@ void generate_files(int f_out, struct fi
delete_in_dir(NULL, NULL, NULL, NULL);
phase++;
delete_in_dir(NULL, NULL, NULL, NULL);
phase++;
@@
-232,7
+232,7
@@
After applying this patch, run these commands for a successful build:
if (local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
if (local_name)
strlcpy(fbuf, local_name, sizeof fbuf);
else
-@@ -144
9,27 +1461
,43 @@ void generate_files(int f_out, struct fi
+@@ -144
7,27 +1459
,43 @@ void generate_files(int f_out, struct fi
phase++;
ignore_non_existing = save_ignore_non_existing;
ignore_existing = save_ignore_existing;
phase++;
ignore_non_existing = save_ignore_non_existing;
ignore_existing = save_ignore_existing;
@@
-768,9
+768,9
@@
After applying this patch, run these commands for a successful build:
{ RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" },
{ RERR_WAITCHILD , "waitpid() failed" },
{ RERR_MALLOC , "error allocating core memory buffers" },
{ RERR_SIGNAL , "received SIGINT, SIGTERM, or SIGHUP" },
{ RERR_WAITCHILD , "waitpid() failed" },
{ RERR_MALLOC , "error allocating core memory buffers" },
-@@ -22
7,8 +225
,8 @@ void rwrite(enum logcode code, char *buf
- if (
quiet && code == FINFO
)
-
return
;
+@@ -22
4,8 +222
,8 @@ void rwrite(enum logcode code, char *buf
+ if (
len < 0
)
+
exit_cleanup(RERR_MESSAGEIO)
;
- if (am_server && msg_fd_out >= 0) {
- /* Pass the message to our sibling. */
- if (am_server && msg_fd_out >= 0) {
- /* Pass the message to our sibling. */