===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sendbug/atomicio.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/usr.bin/sendbug/atomicio.c	2007/07/31 03:44:21	1.2
+++ src/usr.bin/sendbug/atomicio.c	2007/09/07 14:50:44	1.3
@@ -1,4 +1,4 @@
-/* $OpenBSD: atomicio.c,v 1.2 2007/07/31 03:44:21 ray Exp $ */
+/* $OpenBSD: atomicio.c,v 1.3 2007/09/07 14:50:44 tobias Exp $ */
 /*
  * Copyright (c) 2006 Damien Miller. All rights reserved.
  * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
@@ -27,9 +27,10 @@
  */
 
 #include <sys/param.h>
-#include <sys/uio.h>
 
 #include <errno.h>
+#include <poll.h>
+#include <unistd.h>
 
 #include "atomicio.h"
 
@@ -42,13 +43,20 @@
 	char *s = _s;
 	size_t pos = 0;
 	ssize_t res;
+	struct pollfd pfd;
 
+	pfd.fd = fd;
+	pfd.events = f == read ? POLLIN : POLLOUT;
 	while (n > pos) {
 		res = (f) (fd, s + pos, n - pos);
 		switch (res) {
 		case -1:
-			if (errno == EINTR || errno == EAGAIN)
+			if (errno == EINTR)
 				continue;
+			if (errno == EAGAIN) {
+				(void)poll(&pfd, 1, -1);
+				continue;
+			}
 			return 0;
 		case 0:
 			errno = EPIPE;