diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | atomicio.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -36,6 +36,9 @@ | |||
36 | [auth2-none.c] | 36 | [auth2-none.c] |
37 | check whether passwd auth is allowd, similar to proto 1; rob@pitman.co.za | 37 | check whether passwd auth is allowd, similar to proto 1; rob@pitman.co.za |
38 | ok henning | 38 | ok henning |
39 | - avsm@cvs.openbsd.org 2003/07/31 15:50:16 | ||
40 | [atomicio.c] | ||
41 | correct comment: atomicio takes vwrite, not write; deraadt@ ok | ||
39 | 42 | ||
40 | - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] | 43 | - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h] |
41 | Add a tcgetpgrp function. | 44 | Add a tcgetpgrp function. |
@@ -778,4 +781,4 @@ | |||
778 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 781 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
779 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 782 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
780 | 783 | ||
781 | $Id: ChangeLog,v 1.2876 2003/08/02 14:05:01 dtucker Exp $ | 784 | $Id: ChangeLog,v 1.2877 2003/08/02 14:05:58 dtucker Exp $ |
diff --git a/atomicio.c b/atomicio.c index dfc1553c5..7637e1671 100644 --- a/atomicio.c +++ b/atomicio.c | |||
@@ -24,12 +24,12 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: atomicio.c,v 1.11 2003/06/28 16:23:06 deraadt Exp $"); | 27 | RCSID("$OpenBSD: atomicio.c,v 1.12 2003/07/31 15:50:16 avsm Exp $"); |
28 | 28 | ||
29 | #include "atomicio.h" | 29 | #include "atomicio.h" |
30 | 30 | ||
31 | /* | 31 | /* |
32 | * ensure all of data on socket comes through. f==read || f==write | 32 | * ensure all of data on socket comes through. f==read || f==vwrite |
33 | */ | 33 | */ |
34 | ssize_t | 34 | ssize_t |
35 | atomicio(f, fd, _s, n) | 35 | atomicio(f, fd, _s, n) |