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
Fixed the indentation on a few lines.
[rsync/rsync.git]
/
io.c
diff --git
a/io.c
b/io.c
index
c91007e
..
2f5ffb0
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-16,9
+16,9
@@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- *
along with this program; if not, write to the Free Software
- *
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
along
+ *
with this program; if not, write to the Free Software Foundation, Inc.,
+ *
51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
/* Rsync provides its own multiplexing system, which is used to send
*/
/* Rsync provides its own multiplexing system, which is used to send
@@
-46,7
+46,7
@@
extern int read_batch;
extern int csum_length;
extern int checksum_seed;
extern int protocol_version;
extern int csum_length;
extern int checksum_seed;
extern int protocol_version;
-extern int remove_s
ent
_files;
+extern int remove_s
ource
_files;
extern int preserve_hard_links;
extern char *filesfrom_host;
extern struct stats stats;
extern int preserve_hard_links;
extern char *filesfrom_host;
extern struct stats stats;
@@
-257,7
+257,7
@@
static void read_msg_fd(void)
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, buf, 4);
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, buf, 4);
- if (remove_s
ent
_files)
+ if (remove_s
ource
_files)
decrement_active_files(IVAL(buf,0));
flist_ndx_push(&redo_list, IVAL(buf,0));
break;
decrement_active_files(IVAL(buf,0));
flist_ndx_push(&redo_list, IVAL(buf,0));
break;
@@
-267,10
+267,7
@@
static void read_msg_fd(void)
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, buf, len);
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, buf, len);
- if (defer_forwarding_messages)
- msg_list_add(&msg2sndr, MSG_DELETED, buf, len);
- else
- io_multiplex_write(MSG_DELETED, buf, len);
+ send_msg(MSG_DELETED, buf, len);
break;
case MSG_SUCCESS:
if (len != 4 || !am_generator) {
break;
case MSG_SUCCESS:
if (len != 4 || !am_generator) {
@@
-278,12
+275,9
@@
static void read_msg_fd(void)
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, buf, len);
exit_cleanup(RERR_STREAMIO);
}
read_loop(fd, buf, len);
- if (remove_s
ent
_files) {
+ if (remove_s
ource
_files) {
decrement_active_files(IVAL(buf,0));
decrement_active_files(IVAL(buf,0));
- if (defer_forwarding_messages)
- msg_list_add(&msg2sndr, MSG_SUCCESS, buf, len);
- else
- io_multiplex_write(MSG_SUCCESS, buf, len);
+ send_msg(MSG_SUCCESS, buf, len);
}
if (preserve_hard_links)
flist_ndx_push(&hlink_list, IVAL(buf,0));
}
if (preserve_hard_links)
flist_ndx_push(&hlink_list, IVAL(buf,0));
@@
-303,10
+297,7
@@
static void read_msg_fd(void)
if (n >= sizeof buf)
n = sizeof buf - 1;
read_loop(fd, buf, n);
if (n >= sizeof buf)
n = sizeof buf - 1;
read_loop(fd, buf, n);
- if (am_generator && am_server && defer_forwarding_messages)
- msg_list_add(&msg2sndr, tag, buf, n);
- else
- rwrite((enum logcode)tag, buf, n);
+ rwrite(tag, buf, n);
len -= n;
}
break;
len -= n;
}
break;
@@
-320,7
+311,7
@@
static void read_msg_fd(void)
}
/* This is used by the generator to limit how many file transfers can
}
/* This is used by the generator to limit how many file transfers can
- * be active at once when --remove-s
ent
-files is specified. Without
+ * be active at once when --remove-s
ource
-files is specified. Without
* this, sender-side deletions were mostly happening at the end. */
void increment_active_files(int ndx, int itemizing, enum logcode code)
{
* this, sender-side deletions were mostly happening at the end. */
void increment_active_files(int ndx, int itemizing, enum logcode code)
{
@@
-380,14
+371,19
@@
static int msg2genr_flush(int flush_it_all)
return 1;
}
return 1;
}
-
void
send_msg(enum msgcode code, char *buf, int len)
+
int
send_msg(enum msgcode code, char *buf, int len)
{
if (msg_fd_out < 0) {
{
if (msg_fd_out < 0) {
- io_multiplex_write(code, buf, len);
- return;
+ if (!defer_forwarding_messages)
+ return io_multiplex_write(code, buf, len);
+ if (!io_multiplexing_out)
+ return 0;
+ msg_list_add(&msg2sndr, code, buf, len);
+ return 1;
}
msg_list_add(&msg2genr, code, buf, len);
msg2genr_flush(NORMAL_FLUSH);
}
msg_list_add(&msg2genr, code, buf, len);
msg2genr_flush(NORMAL_FLUSH);
+ return 1;
}
int get_redo_num(int itemizing, enum logcode code)
}
int get_redo_num(int itemizing, enum logcode code)