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:
982426b
)
Optimize the --partial-dir=. option (which is the same as just
author
Wayne Davison
<wayned@samba.org>
Thu, 29 Jul 2004 16:07:23 +0000
(16:07 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 29 Jul 2004 16:07:23 +0000
(16:07 +0000)
specifying --partial).
partial-dir.diff
patch
|
blob
|
blame
|
history
diff --git
a/partial-dir.diff
b/partial-dir.diff
index
2a3c4c2
..
50610f3
100644
(file)
--- a/
partial-dir.diff
+++ b/
partial-dir.diff
@@
-86,17
+86,18
@@
You must run "make proto" after applying this patch.
keep_partial = 0;
#else
snprintf(err_buf, sizeof err_buf,
keep_partial = 0;
#else
snprintf(err_buf, sizeof err_buf,
-@@ -777,
7 +787,8
@@ int parse_arguments(int *argc, const cha
+@@ -777,
6 +787,10
@@ int parse_arguments(int *argc, const cha
am_server ? "server" : "client");
return 0;
#endif
am_server ? "server" : "client");
return 0;
#endif
-- }
-+ } else if (partial_dir)
++ } else if (partial_dir) {
++ if (strcmp(partial_dir, ".") == 0)
++ partial_dir = NULL;
+ keep_partial = 1;
+ keep_partial = 1;
+ }
if (files_from) {
if (files_from) {
- char *colon;
-@@ -969,7 +980,10 @@ void server_options(char **args,int *arg
+@@ -969,7 +983,10 @@ void server_options(char **args,int *arg
args[ac++] = arg;
}
args[ac++] = arg;
}
@@
-118,7
+119,7
@@
You must run "make proto" after applying this patch.
extern char *compare_dest;
extern int make_backups;
extern int do_progress;
extern char *compare_dest;
extern int make_backups;
extern int do_progress;
-@@ -34
2,7 +343
,7 @@ int recv_files(int f_in, struct file_lis
+@@ -34
0,7 +341
,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];
@@
-127,7
+128,7
@@
You must run "make proto" after applying this patch.
char fnamecmpbuf[MAXPATHLEN];
struct file_struct *file;
struct stats initial_stats;
char fnamecmpbuf[MAXPATHLEN];
struct file_struct *file;
struct stats initial_stats;
-@@ -4
10,8 +411
,6 @@ int recv_files(int f_in, struct file_lis
+@@ -4
08,8 +409
,6 @@ int recv_files(int f_in, struct file_lis
if (verbose > 2)
rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
if (verbose > 2)
rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
@@
-136,7
+137,7
@@
You must run "make proto" after applying this patch.
if (read_batch) {
while (i > next_gen_i) {
next_gen_i = read_int(batch_gen_fd);
if (read_batch) {
while (i > next_gen_i) {
next_gen_i = read_int(batch_gen_fd);
-@@ -43
8,9 +437
,22 @@ int recv_files(int f_in, struct file_lis
+@@ -43
6,9 +435
,22 @@ int recv_files(int f_in, struct file_lis
continue;
}
continue;
}
@@
-159,7
+160,7
@@
You must run "make proto" after applying this patch.
if (fd1 == -1 && compare_dest != NULL) {
/* try the file at compare_dest instead */
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
if (fd1 == -1 && compare_dest != NULL) {
/* try the file at compare_dest instead */
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-@@ -52
8,7 +540
,8 @@ int recv_files(int f_in, struct file_lis
+@@ -52
6,7 +538
,8 @@ int recv_files(int f_in, struct file_lis
continue;
}
continue;
}
@@
-169,7
+170,7
@@
You must run "make proto" after applying this patch.
}
if (!am_server && verbose) /* log the transfer */
}
if (!am_server && verbose) /* log the transfer */
-@@ -54
8,10 +561
,20 @@ int recv_files(int f_in, struct file_lis
+@@ -54
6,10 +559
,20 @@ int recv_files(int f_in, struct file_lis
exit_cleanup(RERR_FILEIO);
}
exit_cleanup(RERR_FILEIO);
}
@@
-192,7
+193,7
@@
You must run "make proto" after applying this patch.
cleanup_disable();
cleanup_disable();
-@@ -55
9,9 +582
,13 @@ int recv_files(int f_in, struct file_lis
+@@ -55
7,9 +580
,13 @@ int recv_files(int f_in, struct file_lis
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) {
@@
-209,7
+210,7
@@
You must run "make proto" after applying this patch.
if (msgtype == FERROR) {
errstr = "ERROR";
redostr = "";
if (msgtype == FERROR) {
errstr = "ERROR";
redostr = "";
-@@ -5
70,7 +597
,7 @@ int recv_files(int f_in, struct file_lis
+@@ -5
68,7 +595
,7 @@ int recv_files(int f_in, struct file_lis
redostr = " (will try again)";
}
rprintf(msgtype,
redostr = " (will try again)";
}
rprintf(msgtype,