diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2017-05-18 23:45:10 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2017-05-18 23:45:10 +0800 |
| commit | 4dae8edb76c3c252b681669c16f978477c633c16 (patch) | |
| tree | 19c7eac9e1604f2bd75dcc34c266532ea98b0e41 /atomicio.h | |
| parent | a3e01b88841da97aae3d80b155034cc5f9f2c03e (diff) | |
| parent | f7d38a1b9ccbe6225dcf5959d922b6d073638891 (diff) | |
merge main to fuzz
--HG--
branch : fuzz
Diffstat (limited to 'atomicio.h')
| -rw-r--r-- | atomicio.h | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -1,8 +1,7 @@ +/* $OpenBSD: atomicio.h,v 1.7 2006/03/25 22:22:42 djm Exp $ */ /* - * Copied from OpenSSH 3.6.1p2, required for loginrec.c - * - * $OpenBSD: atomicio.h,v 1.4 2001/06/26 06:32:46 itojun Exp $ + * Copied from OpenSSH/OpenBSD, required for loginrec.c * * Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. * All rights reserved. @@ -28,9 +27,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "includes.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(ssize_t (*)(), int, void *, size_t); +size_t atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t); + +#define vwrite (ssize_t (*)(int, void *, size_t))write |