diff options
| author |   avsm <avsm@openbsd.org> | 2004-08-11 21:44:31 +0000 |
|---|---|---|
| committer | avsm <avsm@openbsd.org> | 2004-08-11 21:44:31 +0000 |
| commit | 33b9b8ded88012b545e6b098d4641cc1b465a05f (patch) | |
| tree | 1b1cf42549369a893ae217e8abd09412c84502bc /usr.bin/ssh/ssh-keyscan.c | |
| parent | some signed/unsigned int comparison cleanups; markus@ ok (diff) | |
| download | wireguard-openbsd-33b9b8ded88012b545e6b098d4641cc1b465a05f.tar.xz wireguard-openbsd-33b9b8ded88012b545e6b098d4641cc1b465a05f.zip | |
use atomicio instead of homegrown equivalents or read/write.
markus@ ok
Diffstat (limited to 'usr.bin/ssh/ssh-keyscan.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keyscan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index 9bb4134dbc1..85db4083ad1 100644 --- a/usr.bin/ssh/ssh-keyscan.c +++ b/usr.bin/ssh/ssh-keyscan.c @@ -7,7 +7,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keyscan.c,v 1.49 2004/06/14 01:44:39 djm Exp $"); +RCSID("$OpenBSD: ssh-keyscan.c,v 1.50 2004/08/11 21:44:32 avsm Exp $"); #include <sys/queue.h> #include <errno.h> @@ -485,7 +485,7 @@ congreet(int s) bufsiz = sizeof(buf); cp = buf; - while (bufsiz-- && (n = read(s, cp, 1)) == 1 && *cp != '\n') { + while (bufsiz-- && (n = atomicio(read, s, cp, 1)) == 1 && *cp != '\n') { if (*cp == '\r') *cp = '\n'; cp++; @@ -551,7 +551,7 @@ conread(int s) congreet(s); return; } - n = read(s, c->c_data + c->c_off, c->c_len - c->c_off); + n = atomicio(read, s, c->c_data + c->c_off, c->c_len - c->c_off); if (n < 0) { error("read (%s): %s", c->c_name, strerror(errno)); confree(s); |