- (djm) [Makefile.in]

[openssh.git] / atomicio.h

diff --git a/atomicio.h b/atomicio.h
index 15fc025c332c53bcf48efb52b499e4663880d2be..03bf065e29815ff788dd8496bd96e368d75b494a 100644 (file)
--- a/atomicio.h
+++ b/atomicio.h
@@ -1,5 +1,8 @@
+/* $OpenBSD: atomicio.h,v 1.8 2006/04/16 00:52:55 djm 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
@@ -23,7 +26,24 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef _ATOMICIO_H
+#define _ATOMICIO_H
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/uio.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 */