svn commit: r267703 - head/usr.bin/sed

Pedro F. Giffuni pfg at FreeBSD.org
Sat Jun 21 14:07:35 UTC 2014


Author: pfg
Date: Sat Jun 21 14:07:33 2014
New Revision: 267703
URL: http://svnweb.freebsd.org/changeset/base/267703

Log:
  Drop ifdef nonsense: just use setvbuf(3).
  
  Pointed out by:		kib, bde

Modified:
  head/usr.bin/sed/main.c

Modified: head/usr.bin/sed/main.c
==============================================================================
--- head/usr.bin/sed/main.c	Sat Jun 21 02:24:35 2014	(r267702)
+++ head/usr.bin/sed/main.c	Sat Jun 21 14:07:33 2014	(r267703)
@@ -162,20 +162,14 @@ main(int argc, char *argv[])
 			ispan = 0;	/* don't span across input files */
 			break;
 		case 'l':
-			if(setlinebuf(stdout) != 0)
-				warnx("setlinebuf() failed");
+			if(setvbuf(stdout, NULL, _IOLBF, 0) != 0)
+				warnx("setting line buffered output failed");
 			break;
 		case 'n':
 			nflag = 1;
 			break;
 		case 'u':
-#ifdef _IONBF
-			c = setvbuf(stdout, NULL, _IONBF, 0);
-#else
-			c = -1;
-			errno = EOPNOTSUPP;
-#endif
-			if (c)
+			if(setvbuf(stdout, NULL, _IONBF, 0) != 0)
 				warnx("setting unbuffered output failed");
 			break;
 		default:


More information about the svn-src-head mailing list