diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-08-13 21:19:37 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-08-13 21:19:37 +1000 |
commit | fe6649da0cd211efc069aa9987b00838d030ef1d (patch) | |
tree | 88a21d6391c047fbf32ed9c50b9a7594978e0599 /ssh-keyscan.c | |
parent | c7a6fc41bfdcd73469b153437a8e75e0b1057894 (diff) |
- avsm@cvs.openbsd.org 2004/08/11 21:44:32
[authfd.c scp.c ssh-keyscan.c]
use atomicio instead of homegrown equivalents or read/write.
markus@ ok
Diffstat (limited to 'ssh-keyscan.c')
-rw-r--r-- | ssh-keyscan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index fd3185adf..3cb52ac2e 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "includes.h" | 9 | #include "includes.h" |
10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.49 2004/06/14 01:44:39 djm Exp $"); | 10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.50 2004/08/11 21:44:32 avsm Exp $"); |
11 | 11 | ||
12 | #include "openbsd-compat/sys-queue.h" | 12 | #include "openbsd-compat/sys-queue.h" |
13 | 13 | ||
@@ -494,7 +494,7 @@ congreet(int s) | |||
494 | 494 | ||
495 | bufsiz = sizeof(buf); | 495 | bufsiz = sizeof(buf); |
496 | cp = buf; | 496 | cp = buf; |
497 | while (bufsiz-- && (n = read(s, cp, 1)) == 1 && *cp != '\n') { | 497 | while (bufsiz-- && (n = atomicio(read, s, cp, 1)) == 1 && *cp != '\n') { |
498 | if (*cp == '\r') | 498 | if (*cp == '\r') |
499 | *cp = '\n'; | 499 | *cp = '\n'; |
500 | cp++; | 500 | cp++; |
@@ -560,7 +560,7 @@ conread(int s) | |||
560 | congreet(s); | 560 | congreet(s); |
561 | return; | 561 | return; |
562 | } | 562 | } |
563 | n = read(s, c->c_data + c->c_off, c->c_len - c->c_off); | 563 | n = atomicio(read, s, c->c_data + c->c_off, c->c_len - c->c_off); |
564 | if (n < 0) { | 564 | if (n < 0) { |
565 | error("read (%s): %s", c->c_name, strerror(errno)); | 565 | error("read (%s): %s", c->c_name, strerror(errno)); |
566 | confree(s); | 566 | confree(s); |