diff options
| author | des <des@FreeBSD.org> | 2005-09-03 06:59:33 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2005-09-03 06:59:33 +0000 |
| commit | 755a16fa864cacbbd9fbefc822011b6741351d8d (patch) | |
| tree | b8088b859d6543143de670740f5c6f7bf4e0b23d /crypto/openssh/msg.c | |
| parent | c4dfc1ed3bdacd05d73791b2c8f8b580511a939f (diff) | |
| download | FreeBSD-src-755a16fa864cacbbd9fbefc822011b6741351d8d.zip FreeBSD-src-755a16fa864cacbbd9fbefc822011b6741351d8d.tar.gz | |
Vendor import of OpenSSH 4.2p1.
Diffstat (limited to 'crypto/openssh/msg.c')
| -rw-r--r-- | crypto/openssh/msg.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/crypto/openssh/msg.c b/crypto/openssh/msg.c index 30bc3f1..3e4c288 100644 --- a/crypto/openssh/msg.c +++ b/crypto/openssh/msg.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: msg.c,v 1.7 2003/11/17 09:45:39 djm Exp $"); +RCSID("$OpenBSD: msg.c,v 1.8 2005/05/24 17:32:43 avsm Exp $"); #include "buffer.h" #include "getput.h" @@ -55,15 +55,13 @@ int ssh_msg_recv(int fd, Buffer *m) { u_char buf[4]; - ssize_t res; u_int msg_len; debug3("ssh_msg_recv entering"); - res = atomicio(read, fd, buf, sizeof(buf)); - if (res != sizeof(buf)) { - if (res != 0) - error("ssh_msg_recv: read: header %ld", (long)res); + if (atomicio(read, fd, buf, sizeof(buf)) != sizeof(buf)) { + if (errno != EPIPE) + error("ssh_msg_recv: read: header"); return (-1); } msg_len = GET_32BIT(buf); @@ -73,9 +71,8 @@ ssh_msg_recv(int fd, Buffer *m) } buffer_clear(m); buffer_append_space(m, msg_len); - res = atomicio(read, fd, buffer_ptr(m), msg_len); - if (res != msg_len) { - error("ssh_msg_recv: read: %ld != msg_len", (long)res); + if (atomicio(read, fd, buffer_ptr(m), msg_len) != msg_len) { + error("ssh_msg_recv: read: %s", strerror(errno)); return (-1); } return (0); |
