- djm@cvs.openbsd.org 2010/01/13 01:40:16

[openssh.git] / atomicio.h

diff --git a/atomicio.h b/atomicio.h
index d0252491727e31f5913acc46e7f611248e1a0847..2fcd25d43269f81a2d0591449ba964e30e9bb5cc 100644 (file)
--- a/atomicio.h
+++ b/atomicio.h
@@ -1,7 +1,8 @@
-/*     $OpenBSD: atomicio.h,v 1.2 2001/01/29 01:58:14 niklas Exp $     */
+/* $OpenBSD: atomicio.h,v 1.10 2006/08/03 03:34:41 deraadt Exp $ */
 
 /*
- * Copyright (c) 1995,1999 Theo de Raadt
+ * Copyright (c) 2006 Damien Miller.  All rights reserved.
+ * Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,7 +26,20 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef _ATOMICIO_H
+#define _ATOMICIO_H
+
+/*
+ * Ensure all of data on socket comes through. f==read || f==vwrite
+ */
+size_t atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t);
+
+#define vwrite (ssize_t (*)(int, void *, size_t))write
+
 /*
- * Ensure all of data on socket comes through. f==read || f==write
+ * ensure all of data on socket comes through. f==readv || f==writev
  */
-ssize_t        atomicio(ssize_t (*f)(), int fd, void *s, size_t n);
+size_t atomiciov(ssize_t (*)(int, const struct iovec *, int),
+    int, const struct iovec *, int);
+
+#endif /* _ATOMICIO_H */