From 85f04c6fd545562ce8b53b9a70ba8145cceaa5a9 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sun, 3 Aug 2003 00:05:58 +1000 Subject: [PATCH] - avsm@cvs.openbsd.org 2003/07/31 15:50:16 [atomicio.c] correct comment: atomicio takes vwrite, not write; deraadt@ ok --- ChangeLog | 5 ++++- atomicio.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bee6989e9..ca6c83400 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 dfc1553c5..7637e1671 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)