svn commit: r231524 - head/usr.bin/tee

[Martin Cracauer]

Author: cracauer
Date: Sat Feb 11 16:34:03 2012
New Revision: 231524
URL: http://svn.freebsd.org/changeset/base/231524

Log:
  Reverting last change r231449 (fix bin/164947) due to concerns voiced
  on src-committers and the fact that I can only take care of this in a
  week.

Modified:
  head/usr.bin/tee/tee.c

Modified: head/usr.bin/tee/tee.c
==============================================================================
--- head/usr.bin/tee/tee.c	Sat Feb 11 14:58:46 2012	(r231523)
+++ head/usr.bin/tee/tee.c	Sat Feb 11 16:34:03 2012	(r231524)
@@ -42,10 +42,8 @@ static const char rcsid[] =
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/select.h>
 #include <sys/stat.h>
 #include <err.h>
-#include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <stdio.h>
@@ -62,7 +60,6 @@ static LIST *head;
 
 static void add(int, const char *);
 static void usage(void);
-static void waitfor(int fd);
 
 int
 main(int argc, char *argv[])
@@ -109,14 +106,9 @@ main(int argc, char *argv[])
 			bp = buf;
 			do {
 				if ((wval = write(p->fd, bp, n)) == -1) {
-					if (errno == EAGAIN) {
-						waitfor(p->fd);
-						wval = 0;
-					} else {
-						warn("%s", p->name);
-						exitval = 1;
-						break;
-					}
+					warn("%s", p->name);
+					exitval = 1;
+					break;
 				}
 				bp += wval;
 			} while (n -= wval);
@@ -145,15 +137,3 @@ add(int fd, const char *name)
 	p->next = head;
 	head = p;
 }
-
-/* Wait for the specified fd to be ready for writing */
-static void
-waitfor(int fd)
-{
-       fd_set writefds;
-
-       FD_ZERO(&writefds);
-       FD_SET(fd, &writefds);
-       if (select(fd + 1, NULL, &writefds, NULL, NULL) == -1)
-               err(1, "select");
-}