diff options
author | Wayne Davison <wayned@samba.org> | 2008-08-31 09:03:50 -0700 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2008-08-31 09:43:39 -0700 |
commit | 8b3e60523aa3d86583a1df54c81c9d480ea19740 (patch) | |
tree | 31cc4d0652a20fb75cf0d64cbeb281a570b3a6a4 /rsync.c | |
parent | 1d891835e7933f2c82bf636b0f27a936dc432e5c (diff) | |
download | rsync-8b3e60523aa3d86583a1df54c81c9d480ea19740.tar.gz |
Improved the fix that ensures that the generator gets notified about an
I/O error for the incremental directory that generated the error. The
PROTOCOL_VERSION was bumped to 31 to implement this.
Diffstat (limited to 'rsync.c')
-rw-r--r-- | rsync.c | 15 |
1 files changed, 1 insertions, 14 deletions
@@ -48,8 +48,6 @@ extern int flist_eof; extern int msgs2stderr; extern int keep_dirlinks; extern int make_backups; -extern int delete_during; -extern int check_for_io_err; extern struct file_list *cur_flist, *first_flist, *dir_flist; extern struct chmod_mode_struct *daemon_chmod_modes; #ifdef ICONV_OPTION @@ -254,15 +252,8 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr, while (1) { ndx = read_ndx(f_in); - if (ndx >= 0) { - if (check_for_io_err) { - /* Let generator know there was no I/O error. */ - send_msg_int(MSG_IO_ERROR, 0); - check_for_io_err = 0; - } + if (ndx >= 0) break; - } - check_for_io_err = 0; if (ndx == NDX_DONE) return ndx; if (!inc_recurse || am_sender) { @@ -306,10 +297,6 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr, stop_flist_forward(); if (!msgs2stderr) negate_output_levels(); /* restore info/debug output */ - /* If the sender is going to send us an MSG_IO_ERROR value, it - * will always be the very next message following a file list. */ - if (delete_during) - check_for_io_err = 1; } iflags = protocol_version >= 29 ? read_shortint(f_in) |