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
Improved rwrite() to handle a stderr exception without playing games
[rsync/rsync.git]
/
main.c
diff --git
a/main.c
b/main.c
index
af14f36
..
dc3c533
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-32,7
+32,6
@@
extern int list_only;
extern int am_root;
extern int am_server;
extern int am_sender;
extern int am_root;
extern int am_server;
extern int am_sender;
-extern int am_generator;
extern int am_daemon;
extern int inc_recurse;
extern int blocking_io;
extern int am_daemon;
extern int inc_recurse;
extern int blocking_io;
@@
-65,8
+64,11
@@
extern int whole_file;
extern int read_batch;
extern int write_batch;
extern int batch_fd;
extern int read_batch;
extern int write_batch;
extern int batch_fd;
+extern int flist_eof;
extern int filesfrom_fd;
extern int filesfrom_fd;
+extern int delete_during;
extern int connect_timeout;
extern int connect_timeout;
+extern int check_for_io_err;
extern pid_t cleanup_child_pid;
extern unsigned int module_dirlen;
extern struct stats stats;
extern pid_t cleanup_child_pid;
extern unsigned int module_dirlen;
extern struct stats stats;
@@
-85,6
+87,7
@@
extern struct file_list *first_flist;
extern struct filter_list_struct daemon_filter_list;
uid_t our_uid;
extern struct filter_list_struct daemon_filter_list;
uid_t our_uid;
+int am_generator = 0;
int local_server = 0;
int daemon_over_rsh = 0;
mode_t orig_umask = 0;
int local_server = 0;
int daemon_over_rsh = 0;
mode_t orig_umask = 0;
@@
-765,6
+768,8
@@
static int do_recv(int f_in, int f_out, char *local_name)
exit_cleanup(RERR_IPC);
}
exit_cleanup(RERR_IPC);
}
+ check_for_io_err = inc_recurse && delete_during && !flist_eof;
+
if (pid == 0) {
close(error_pipe[0]);
if (f_in != f_out)
if (pid == 0) {
close(error_pipe[0]);
if (f_in != f_out)