diff options
author | deraadt@openbsd.org <deraadt@openbsd.org> | 2019-06-28 13:35:04 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-07-05 11:10:39 +1000 |
commit | 4d28fa78abce2890e136281950633fae2066cc29 (patch) | |
tree | 33226ec64ced661bb7e40005e30744b68fa59a80 /mux.c | |
parent | e8c974043c1648eab0ad67a7ba6a3e444fe79d2d (diff) |
upstream: When system calls indicate an error they return -1, not
some arbitrary value < 0. errno is only updated in this case. Change all
(most?) callers of syscalls to follow this better, and let's see if this
strictness helps us in the future.
OpenBSD-Commit-ID: 48081f00db7518e3b712a49dca06efc2a5428075
Diffstat (limited to 'mux.c')
-rw-r--r-- | mux.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: mux.c,v 1.79 2019/01/19 21:35:25 djm Exp $ */ | 1 | /* $OpenBSD: mux.c,v 1.80 2019/06/28 13:35:04 deraadt Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -1492,7 +1492,7 @@ mux_client_read(int fd, struct sshbuf *b, size_t need) | |||
1492 | return -1; | 1492 | return -1; |
1493 | } | 1493 | } |
1494 | len = read(fd, p + have, need - have); | 1494 | len = read(fd, p + have, need - have); |
1495 | if (len < 0) { | 1495 | if (len == -1) { |
1496 | switch (errno) { | 1496 | switch (errno) { |
1497 | #if defined(EWOULDBLOCK) && (EWOULDBLOCK != EAGAIN) | 1497 | #if defined(EWOULDBLOCK) && (EWOULDBLOCK != EAGAIN) |
1498 | case EWOULDBLOCK: | 1498 | case EWOULDBLOCK: |
@@ -1541,7 +1541,7 @@ mux_client_write_packet(int fd, struct sshbuf *m) | |||
1541 | return -1; | 1541 | return -1; |
1542 | } | 1542 | } |
1543 | len = write(fd, ptr + have, need - have); | 1543 | len = write(fd, ptr + have, need - have); |
1544 | if (len < 0) { | 1544 | if (len == -1) { |
1545 | switch (errno) { | 1545 | switch (errno) { |
1546 | #if defined(EWOULDBLOCK) && (EWOULDBLOCK != EAGAIN) | 1546 | #if defined(EWOULDBLOCK) && (EWOULDBLOCK != EAGAIN) |
1547 | case EWOULDBLOCK: | 1547 | case EWOULDBLOCK: |
@@ -2324,7 +2324,7 @@ muxclient(const char *path) | |||
2324 | fatal("ControlPath too long ('%s' >= %u bytes)", path, | 2324 | fatal("ControlPath too long ('%s' >= %u bytes)", path, |
2325 | (unsigned int)sizeof(addr.sun_path)); | 2325 | (unsigned int)sizeof(addr.sun_path)); |
2326 | 2326 | ||
2327 | if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) | 2327 | if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) == -1) |
2328 | fatal("%s socket(): %s", __func__, strerror(errno)); | 2328 | fatal("%s socket(): %s", __func__, strerror(errno)); |
2329 | 2329 | ||
2330 | if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == -1) { | 2330 | if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == -1) { |