summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--atomicio.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index bee6989e..ca6c8340 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,9 @@
[auth2-none.c]
check whether passwd auth is allowd, similar to proto 1; rob@pitman.co.za
ok henning
+ - avsm@cvs.openbsd.org 2003/07/31 15:50:16
+ [atomicio.c]
+ correct comment: atomicio takes vwrite, not write; deraadt@ ok
- (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
Add a tcgetpgrp function.
@@ -778,4 +781,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2876 2003/08/02 14:05:01 dtucker Exp $
+$Id: ChangeLog,v 1.2877 2003/08/02 14:05:58 dtucker Exp $
diff --git a/atomicio.c b/atomicio.c
index dfc1553c..7637e167 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -24,12 +24,12 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: atomicio.c,v 1.11 2003/06/28 16:23:06 deraadt Exp $");
+RCSID("$OpenBSD: atomicio.c,v 1.12 2003/07/31 15:50:16 avsm Exp $");
#include "atomicio.h"
/*
- * ensure all of data on socket comes through. f==read || f==write
+ * ensure all of data on socket comes through. f==read || f==vwrite
*/
ssize_t
atomicio(f, fd, _s, n)