diff options
| author | Sebastian Benoit <benno@cvs.openbsd.org> | 2019-02-18 22:47:35 +0000 |
|---|---|---|
| committer | Sebastian Benoit <benno@cvs.openbsd.org> | 2019-02-18 22:47:35 +0000 |
| commit | 2f42213ec04aa78b5d93fb5d401b5976e9fa06f1 (patch) | |
| tree | dfdaa1bcacef4b596c963575403c3736797938d2 /usr.bin/rsync/io.c | |
| parent | 9bb0da04d46a25150c43281f9df758c060567427 (diff) | |
new attempt to sync with kristaps up to Sun Feb 17 2019
339cf5998c0c022623cd68de50722b6c14543952 Push "error trail" further into code.
baf58ce5fe1bc6ce431b3b0ac8264b83ae8c7d02 Document all arguments. Add
common -av usage. Remove bits about not supporting anything but
files/dirs.
821a811a8c80e52fb56b241fc65a16cae1b4fb2c Disambiguate as prodded by deraadt@
6c4475b8f226e9031ec0ec1b3f14f7d347132c87 Add -h to usage string
4d344ae6156873b44c95de0c1ed629e637c2d7ab Clarify error message
language, use service name instead of port, specify that the socket is
SOCK_STREAM. From deraadt@. Tweaked for lowercase messages.
f3ec049e76257fc96bcdc872f1d3b967b98f3eb6 In consideration to benno@'s
comments, let the mktemp functions propogate an errno handled by the
caller. Also keep the original line lengths. While in mktemp.c, make
some defines into an enum.
e116c2bd00e634b56e4276120135915ceaa31cf2 Put the FSM of the sender
into its own function. Put dry_run ack and end of phase ack into the
send buffer too, further reducing the possibility of deadlock.
c7745aa4c7394ca89d841f8ee76782256d694340 Make the sender write loop be
fully non-blocking. This frees us of deadlocking the protocol because
the sender will always be able to pull down data.
93c7b4843e80aeac2ec6ae6ffc395df4deaf4a31 Remove "yoda" notation to be
more in tune with OpenBSD. Most found by deraadt@.
Diffstat (limited to 'usr.bin/rsync/io.c')
| -rw-r--r-- | usr.bin/rsync/io.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/rsync/io.c b/usr.bin/rsync/io.c index 806fb56a230..926d60199dd 100644 --- a/usr.bin/rsync/io.c +++ b/usr.bin/rsync/io.c @@ -1,4 +1,4 @@ -/* $Id: io.c,v 1.11 2019/02/18 21:55:27 benno Exp $ */ +/* $Id: io.c,v 1.12 2019/02/18 22:47:34 benno Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -304,8 +304,7 @@ io_read_flush(struct sess *sess, int fd) } else if (sess->mplex_read_remain == 0) return 1; - if (!io_read_blocking(sess, fd, - mpbuf, sess->mplex_read_remain)) { + if (!io_read_blocking(sess, fd, mpbuf, sess->mplex_read_remain)) { ERRX1(sess, "io_read_blocking"); return 0; } |