Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed the variable "incremental" to "inc_recurse".
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
5371b14
..
358589f
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-34,7
+34,7
@@
extern int am_server;
extern int am_sender;
extern int am_generator;
extern int am_daemon;
extern int am_sender;
extern int am_generator;
extern int am_daemon;
-extern int inc
remental
;
+extern int inc
_recurse
;
extern int blocking_io;
extern int remove_source_files;
extern int daemon_over_rsh;
extern int blocking_io;
extern int remove_source_files;
extern int daemon_over_rsh;
@@
-844,7
+844,7
@@
static void do_server_recv(int f_in, int f_out, int argc, char *argv[])
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
}
rprintf(FERROR,"server_recv: recv_file_list error\n");
exit_cleanup(RERR_FILESELECT);
}
- if (inc
remental
&& file_total == 1)
+ if (inc
_recurse
&& file_total == 1)
recv_additional_file_list(f_in);
verbose = save_verbose;
recv_additional_file_list(f_in);
verbose = save_verbose;
@@
-1010,7
+1010,7
@@
int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
if (write_batch && !am_server)
start_write_batch(f_in);
flist = recv_file_list(f_in);
if (write_batch && !am_server)
start_write_batch(f_in);
flist = recv_file_list(f_in);
- if (inc
remental
&& file_total == 1)
+ if (inc
_recurse
&& file_total == 1)
recv_additional_file_list(f_in);
if (flist && flist->count > 0) {
recv_additional_file_list(f_in);
if (flist && flist->count > 0) {