From owner-svn-src-all@FreeBSD.ORG  Sat Feb 11 16:34:03 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E2C051065670;
	Sat, 11 Feb 2012 16:34:03 +0000 (UTC)
	(envelope-from cracauer@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CD6D08FC12;
	Sat, 11 Feb 2012 16:34:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1BGY37x038863;
	Sat, 11 Feb 2012 16:34:03 GMT
	(envelope-from cracauer@svn.freebsd.org)
Received: (from cracauer@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1BGY3BN038861;
	Sat, 11 Feb 2012 16:34:03 GMT
	(envelope-from cracauer@svn.freebsd.org)
Message-Id: <201202111634.q1BGY3BN038861@svn.freebsd.org>
From: Martin Cracauer <cracauer@FreeBSD.org>
Date: Sat, 11 Feb 2012 16:34:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231524 - head/usr.bin/tee
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Feb 2012 16:34:04 -0000

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");
-}