From jlh@felucia.tataz.chchile.org  Thu Apr  5 07:25:07 2012
Return-Path: <jlh@felucia.tataz.chchile.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 26852106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Apr 2012 07:25:07 +0000 (UTC)
	(envelope-from jlh@felucia.tataz.chchile.org)
Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [IPv6:2a01:e0c:1:1599::14])
	by mx1.freebsd.org (Postfix) with ESMTP id 363DE8FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Apr 2012 07:25:04 +0000 (UTC)
Received: from endor.tataz.chchile.org (unknown [82.233.239.98])
	by smtp5-g21.free.fr (Postfix) with ESMTP id C144ED4812F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Apr 2012 09:24:59 +0200 (CEST)
Received: from felucia.tataz.chchile.org (felucia.tataz.chchile.org [192.168.1.9])
	by endor.tataz.chchile.org (Postfix) with ESMTP id 7DB622A00
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  5 Apr 2012 07:24:58 +0000 (UTC)
Received: by felucia.tataz.chchile.org (Postfix, from userid 1000)
	id 6E55DD95F; Thu,  5 Apr 2012 07:24:58 +0000 (UTC)
Message-Id: <20120405072458.6E55DD95F@felucia.tataz.chchile.org>
Date: Thu,  5 Apr 2012 07:24:58 +0000 (UTC)
From: Jeremie Le Hen <jeremie@le-hen.org>
Reply-To: Jeremie Le Hen <jeremie@le-hen.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] New util/shlib to change per-fd default stdio buffering mode
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         166660
>Category:       bin
>Synopsis:       [libc] [patch] New util/shlib to change per-fd default stdio buffering mode
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jlh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 05 07:30:02 UTC 2012
>Closed-Date:    Tue May 08 19:45:28 UTC 2012
>Last-Modified:  Tue May 08 19:45:28 UTC 2012
>Originator:     Jeremie Le Hen
>Release:        FreeBSD 9.0-STABLE
>Organization:
>Environment:
System: FreeBSD 9.0-STABLE

>Description:
	When stdin and stdout are not connected to a terminal, the stdio
	subsystem switches automatically stdout buffering mode from
	line-buffered to fully-buffered.

	This is a problem when trying to watch the real-time output of a
	command such as vmstat(8) or iostat(8) through multiple filters.

	For instance: iostat -x 1 | cat -n | grep -v "extended"

	In this case, cat(1)'s stdout is fully buffered and iostat(8)
	produces output too slowly, so you have to wait multiple seconds
	before the buffer is eventually flushed as a block to the last
	command.

>How-To-Repeat:
	Just run the command above.  On my system with 4 drives, I have
	to wait more than 20 seconds to see something.

>Fix:
	The patch below adds a new shared library "libstdbuf.so" which,
	when LD_PRELOAD'ed, can be configured through environment
	variables to override the default buffering mode of either
	stdin, stdout or stderr.

	In order to avoid the manual setting of LD_PRELOAD and configuration
	variables, an utility is provided: stdbuf(1).  It is named after a
	similar functionality found on Linux.  Of course, given the
	command-line interface is sane enough to comply with BSD standards,
	I kept it fully compatible.

	Here is an example of how the above problem can be solved with this
	new utility:
	    iostat -x 1 | stdbuf -o L cat -n | grep -v "extended"


--- stdbuf.diff begins here ---
diff -urNp src.HEAD_20111506/lib/libc/stdio/setbuf.3 src/lib/libc/stdio/setbuf.3
--- src.HEAD_20111506/lib/libc/stdio/setbuf.3	2007-01-09 01:28:07.000000000 +0100
+++ src/lib/libc/stdio/setbuf.3	2011-08-04 19:00:49.000000000 +0200
@@ -83,6 +83,9 @@ normally does) it is line buffered.
 The standard error stream
 .Dv stderr
 is always unbuffered.
+Note that these defaults maybe be altered using the
+.Xr stdbuf 1
+utility.
 .Pp
 The
 .Fn setvbuf
@@ -177,6 +180,7 @@ function returns what the equivalent
 .Fn setvbuf
 would have returned.
 .Sh SEE ALSO
+.Xr stdbuf 1 ,
 .Xr fclose 3 ,
 .Xr fopen 3 ,
 .Xr fread 3 ,
diff -urNp src.HEAD_20111506/lib/libstdbuf/Makefile src/lib/libstdbuf/Makefile
--- src.HEAD_20111506/lib/libstdbuf/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ src/lib/libstdbuf/Makefile	2011-08-04 18:49:59.000000000 +0200
@@ -0,0 +1,15 @@
+# $FreeBSD: src/lib/libftpio/Makefile,v 1.17.2.1 2009/08/03 08:13:06 kensmith Exp $
+
+.include <bsd.own.mk>
+
+LIB=		stdbuf
+SRCS=		stdbuf.c
+SHLIB_MAJOR=	1
+MAN=		libstdbuf.3
+
+CFLAGS+=	-I${.CURDIR}
+LDADD=		-lutil
+
+WARNS?=		6
+
+.include <bsd.lib.mk>
diff -urNp src.HEAD_20111506/lib/libstdbuf/libstdbuf.3 src/lib/libstdbuf/libstdbuf.3
--- src.HEAD_20111506/lib/libstdbuf/libstdbuf.3	1970-01-01 01:00:00.000000000 +0100
+++ src/lib/libstdbuf/libstdbuf.3	2011-08-04 18:47:04.000000000 +0200
@@ -0,0 +1,111 @@
+.\" Copyright (c) 2011 Jeremie Le Hen
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd August 4, 2011
+.Dt LIBSTDBUF 3
+.Os
+.Sh NAME
+.Nm libstdbuf
+.Nd preloaded library to change standard streams initial buffering
+.Sh DESCRIPTION
+The
+.Nm
+library is meant to be preloaded with the
+.Ev LD_PRELOAD
+environment variable to as to change the initial buffering
+of standard input, standard output and standard error streams.
+.Pp
+Although you may load and configure this library manually,
+an utility,
+.Xr stdbuf 1 ,
+can be used to run a command with the appropriate environment variables.
+.Sh ENVIRONMENT
+Each stream can be configured indepentently through the following
+environment variables (values are defined below):
+.Bl -tag -width size -offset indent
+.It Ev STDBUF_0
+Initial buffering definition for the standard input stream
+.It Ev STDBUF_1
+Initial buffering definition for the standard output stream
+.It Ev STDBUF_2
+Initial buffering definition for the standard error stream
+.It Ev _STDBUF_I
+GNU-compatible variable for
+.Ev STDBUF_0
+.It Ev _STDBUF_O
+GNU-compatible variable equivalent to
+.Ev STDBUF_1
+.It Ev _STDBUF_E
+GNU-compatible variable equivalent to
+.Ev STDBUF_2
+.El
+.Pp
+Each variable may take one of the following values:
+.Bl -tag -width size -offset indent
+.It Qq 0
+unbuffered
+.It Qq L
+line buffered
+.It Qq B
+fully buffered with the default buffer size
+.It Ar size
+fully buffered with a buffer of
+.Ar size
+bytes
+.El
+.Sh EXAMPLE
+In the following example, the stdout stream of the
+.Xr awk 1
+command
+will be fully buffered by default because it does not refer
+to a terminal.
+.Nm
+is used to force it to be line-buffered so
+.Xr vmstat 8 Ns 's
+output will not stall until the full buffer fills.
+.Bd -literal -offset indent
+# vmstat 1 | LD_PRELOAD=/usr/lib/libstdbuf.so \\
+    STDBUF_1=L awk '$2 > 1 || $3 > 1' | cat -n
+.Ed
+.Pp
+See also the manpage of
+.Xr stdbuf 1
+for a simpler way to do this.
+.Sh HISTORY
+The
+.Nm
+library first appeared in
+.Fx 9.0 .
+.Sh AUTHORS
+.An -nosplit
+The original idea of the
+.Nm
+command comes from
+.An Padraig Brady
+who implemented it in the GNU coreutils.
+.An Jeremie Le Hen
+implemented it on
+.Fx .
diff -urNp src.HEAD_20111506/lib/libstdbuf/stdbuf.c src/lib/libstdbuf/stdbuf.c
--- src.HEAD_20111506/lib/libstdbuf/stdbuf.c	1970-01-01 01:00:00.000000000 +0100
+++ src/lib/libstdbuf/stdbuf.c	2011-08-04 18:17:07.000000000 +0200
@@ -0,0 +1,105 @@
+/*-
+ * Copyright (c) 2011 Jeremie Le Hen
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <err.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <libutil.h>
+
+static const char *
+stream_name(FILE *s)
+{
+	if (s == stdin)
+		return "stdin";
+	if (s == stdout)
+		return "stdout";
+	if (s == stderr)
+		return "stderr";
+	/* This should not happen. */
+	abort();
+}
+
+static void
+change_buf(FILE *s, const char *bufmode)
+{
+	size_t bufsiz;
+	uint64_t sizearg;
+	int mode;
+
+	bufsiz = 0;
+	if (bufmode[0] == '0' && bufmode[1] == '\0')
+		mode = _IONBF;
+	else if (bufmode[0] == 'L' && bufmode[1] == '\0')
+		mode = _IOLBF;
+	else if (bufmode[0] == 'B' && bufmode[1] == '\0') {
+		mode = _IOFBF;
+		bufsiz = 0;
+	} else {
+		errno = 0;
+		if (expand_number(bufmode, &sizearg) == -1) {
+			warn("Wrong buffer mode '%s' for %s", bufmode,
+			    stream_name(s));
+			return;
+		}
+		if (sizearg > SIZE_T_MAX) {
+			warn("Buffer size too big for %s", stream_name(s));
+			return;
+		}
+		mode = _IOFBF;
+		bufsiz = (size_t)sizearg;
+	}
+	if (setvbuf(s, NULL, mode, bufsiz) != 0)
+		warn("Cannot set buffer mode '%s' for %s", bufmode,
+		    stream_name(s));
+}
+
+__attribute__ ((constructor)) static void
+stdbuf(void)
+{
+	char *i_mode, *o_mode, *e_mode;
+
+	i_mode = getenv("STDBUF_0");
+	if (i_mode == NULL)
+		i_mode = getenv("_STDBUF_I");
+	o_mode = getenv("STDBUF_1");
+	if (o_mode == NULL)
+		o_mode = getenv("_STDBUF_O");
+	e_mode = getenv("STDBUF_2");
+	if (e_mode == NULL)
+		e_mode = getenv("_STDBUF_E");
+
+	if (e_mode)
+		change_buf(stderr, e_mode);
+	if (i_mode)
+		change_buf(stdin, i_mode);
+	if (o_mode)
+		change_buf(stdout, o_mode);
+}
diff -urNp src.HEAD_20111506/usr.bin/stdbuf/Makefile src/usr.bin/stdbuf/Makefile
--- src.HEAD_20111506/usr.bin/stdbuf/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ src/usr.bin/stdbuf/Makefile	2011-08-02 19:16:30.000000000 +0200
@@ -0,0 +1,8 @@
+# $Id$
+
+PROG=   stdbuf
+SRCS=   stdbuf.c
+
+WARNS?=	6
+
+.include <bsd.prog.mk>
Files src.HEAD_20111506/usr.bin/stdbuf/sh.core and src/usr.bin/stdbuf/sh.core differ
diff -urNp src.HEAD_20111506/usr.bin/stdbuf/stdbuf.1 src/usr.bin/stdbuf/stdbuf.1
--- src.HEAD_20111506/usr.bin/stdbuf/stdbuf.1	1970-01-01 01:00:00.000000000 +0100
+++ src/usr.bin/stdbuf/stdbuf.1	2011-08-04 18:46:35.000000000 +0200
@@ -0,0 +1,124 @@
+.\" Copyright (C) 2011 Jeremie Le Hen
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code and documentation must retain the above
+.\"    copyright notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed or owned by Caldera
+.\"	International, Inc.
+.\" 4. Neither the name of Caldera International, Inc. nor the names of other
+.\"    contributors may be used to endorse or promote products derived from
+.\"    this software without specific prior written permission.
+.\"
+.\" USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
+.\" INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
+.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+.\" IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
+.\" INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.\"	$FreeBSD: src/usr.bin/dc/dc.1,v 1.2 2010/01/22 23:50:46 delphij Exp $
+.\"
+.Dd August 4, 2011
+.Dt STDBUF 1
+.Os
+.Sh NAME
+.Nm stdbuf
+.Nd change standard streams initial buffering
+.Sh SYNOPSIS
+.Nm
+.Op Fl e Ar bufdef
+.Op Fl i Ar bufdef
+.Op Fl o Ar bufdef
+.Op Ar command Op ...
+.Sh DESCRIPTION
+.Nm
+is used to change the initial buffering of standard input,
+standard output and/or standard error streams for
+.Ar command .
+It relies on
+.Xr libstdbuf 3
+which is loaded and configured by
+.Nm
+through environment variables.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl e Ar bufdef
+Set initial buffering of the standard error stream for
+.Ar command
+as defined by
+.Ar bufdef
+.Pq see Sx BUFFER DEFINITION .
+.It Fl i Ar bufdef
+Set initial buffering of the standard input stream for
+.Ar command
+as defined by
+.Ar bufdef
+.Pq see Sx BUFFER DEFINITION .
+.It Fl o Ar bufdef
+Set initial buffering of the standard output stream for
+.Ar command
+as defined by
+.Ar bufdef
+.Pq see Sx BUFFER DEFINITION .
+.El
+.Sh BUFFER DEFINITION
+Buffer definition is the same as in
+.Xr libstdbuf 3 :
+.Bl -tag -width size -offset indent
+.It Qq 0
+unbuffered
+.It Qq L
+line buffered
+.It Qq B
+fully buffered with the default buffer size
+.It Ar size
+fully buffered with a buffer of
+.Ar size
+bytes
+.El
+.Sh EXAMPLES
+In the following example, the stdout stream of the
+.Xr awk 1
+command
+will be fully buffered by default because it does not refer
+to a terminal.
+.Nm
+is used to force it to be line-buffered so
+.Xr vmstat 8 Ns 's
+output will not stall until the full buffer fills.
+.Bd -literal -offset indent
+# vmstat 1 | stdbuf -o L awk '$2 > 1 || $3 > 1' | cat -n
+.Ed
+.Sh SEE ALSO
+.Xr libstdbuf 3 ,
+.Xr setvbuf 3
+.Sh HISTORY
+The
+.Nm
+utility first appeared in
+.Fx 9.0 .
+.Sh AUTHORS
+.An -nosplit
+The original idea of the
+.Nm
+command comes from 
+.An Padraig Brady
+who implemented it in the GNU coreutils.
+.An Jeremie Le Hen
+implemented it on
+.Fx .
diff -urNp src.HEAD_20111506/usr.bin/stdbuf/stdbuf.c src/usr.bin/stdbuf/stdbuf.c
--- src.HEAD_20111506/usr.bin/stdbuf/stdbuf.c	1970-01-01 01:00:00.000000000 +0100
+++ src/usr.bin/stdbuf/stdbuf.c	2011-08-04 18:17:50.000000000 +0200
@@ -0,0 +1,107 @@
+/*-
+ * Copyright (c) 2011 Jeremie Le Hen
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#define	LIBSTDBUF	"/usr/lib/libstdbuf.so"
+
+extern char *__progname;
+
+static void usage(int);
+
+static void
+usage(int s)
+{
+	
+	fprintf(stderr, "Usage: %s [-e bufdef] [-i bufdef] [-o bufdef] "
+	    "<command> [args ...]\n", __progname);
+	fprintf(stderr, "  ``bufdef'' being:\n");
+	fprintf(stderr, "    - \"0\" to disable buffering;\n");
+	fprintf(stderr, "    - \"L\" to set line-buffering;\n");
+	fprintf(stderr, "    - <size> to set full-buffering.\n");
+	exit(s);
+}
+
+int
+main(int argc, char *argv[])
+{
+	int i;
+	char *ibuf = NULL, *obuf = NULL, *ebuf = NULL;
+	char *preload0, *preload1;
+
+	while ((i = getopt(argc, argv, ":e:i:o:")) != -1) {
+		switch (i) {
+		case 'e':
+			ebuf = optarg;
+			break;
+		case 'i':
+			ibuf = optarg;
+			break;
+		case 'o':
+			obuf = optarg;
+			break;
+		case ':':
+			warnx("Missing argument for option -%c", optopt);
+			usage(1);
+			break;
+		case '?':
+		default:
+			warnx("Unknown option -%c", optopt);
+			usage(1);
+			break;
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (ibuf != NULL && setenv("STDBUF_0", ibuf, 1) == -1)
+		warn("Failed to set environment variable: %s=%s",
+		    "STDBUF_0", ibuf);
+	if (obuf != NULL && setenv("STDBUF_1", obuf, 1) == -1)
+		warn("Failed to set environment variable: %s=%s",
+		    "STDBUF_1", obuf);
+	if (ebuf != NULL && setenv("STDBUF_2", ebuf, 1) == -1)
+		warn("Failed to set environment variable: %s=%s",
+		    "STDBUF_2", ebuf);
+
+	preload0 = getenv("LD_PRELOAD");
+	if (preload0 == NULL)
+		i = asprintf(&preload1, "LD_PRELOAD=" LIBSTDBUF);
+	else
+		i = asprintf(&preload1, "LD_PRELOAD=%s:%s", preload0,
+		    LIBSTDBUF);
+
+	if (i < 0 || putenv(preload1) == -1)
+		warn("Failed to set environment variable: %s", preload1);
+
+	execvp(argv[0], argv);
+	err(2, "%s", argv[0]);
+}
--- stdbuf.diff ends here ---


>Release-Note:
>Audit-Trail:

From: John Baldwin <jhb@FreeBSD.org>
To: bug-followup@FreeBSD.org, jeremie@le-hen.org
Cc:  
Subject: Re: bin/166660: [libc] [patch] New util/shlib to change per-fd default
 stdio buffering mode
Date: Mon, 09 Apr 2012 11:30:08 -0400

 I think it would be fine to do this in libc directly rather than via
 LD_PRELOAD.  That would let it work for static binaries as well as
 dynamic libraries.  My understanding is that this is how stdbuf works on
 Linux (glibc honors the relevant magic environment variables).  To that
 end, I think it would be ok to move this into libc directly.
 
 One more question, do you use the same environment variable as glibc for
 this, or do you use a different scheme?
 
 -- 
 John Baldwin

From: Jeremie Le Hen <jeremie@le-hen.org>
To: John Baldwin <jhb@FreeBSD.org>
Cc: bug-followup@FreeBSD.org, jeremie@le-hen.org
Subject: Re: bin/166660: [libc] [patch] New util/shlib to change per-fd
 default stdio buffering mode
Date: Mon, 9 Apr 2012 23:21:03 +0200

 Hi John,
 
 On Mon, Apr 09, 2012 at 11:30:08AM -0400, John Baldwin wrote:
 > I think it would be fine to do this in libc directly rather than via
 > LD_PRELOAD.  That would let it work for static binaries as well as
 > dynamic libraries.  My understanding is that this is how stdbuf works on
 > Linux (glibc honors the relevant magic environment variables).  To that
 > end, I think it would be ok to move this into libc directly.
 
 I thought it would be too expensive to check for three (actually up to
 six, see below) in such a critical path.  Moreover, this would have
 lowered a lot my chances to see this committed simply because very few
 committers would have taken the responsibility for this and the time to
 handle the debates that would have sprouted.
 
 Your point for static binaries is very valid but aren't you afraid of
 the performance impact?  I'll try to spare some time this week to move
 libstdbuf code into libc and do some benchmarks.
 
 > One more question, do you use the same environment variable as glibc for
 > this, or do you use a different scheme?
 
 I didn't like the GNU variable names (_STDBUF_I, _STDBUF_O and
 _STDBUF_E) so I used STDBUF_0, STDBUF_1 and STDBUF_2 instead.  But the
 former are supported for obvious compatibility reasons.  To be honest I
 don't really care about the names, we can use the GNU ones if you think
 it's better to avoid doing to much strcmp(3), especially if we but the
 code in the libc startup path.
 
 Regards,
 -- 
 Jeremie Le Hen
 
 Men are born free and equal.  Later on, they're on their own.
 				Jean Yanne

From: John Baldwin <jhb@freebsd.org>
To: Jeremie Le Hen <jeremie@le-hen.org>
Cc: bug-followup@freebsd.org
Subject: Re: bin/166660: [libc] [patch] New util/shlib to change per-fd default stdio buffering mode
Date: Tue, 10 Apr 2012 09:43:16 -0400

 On Monday, April 09, 2012 5:21:03 pm Jeremie Le Hen wrote:
 > Hi John,
 > 
 > On Mon, Apr 09, 2012 at 11:30:08AM -0400, John Baldwin wrote:
 > > I think it would be fine to do this in libc directly rather than via
 > > LD_PRELOAD.  That would let it work for static binaries as well as
 > > dynamic libraries.  My understanding is that this is how stdbuf works on
 > > Linux (glibc honors the relevant magic environment variables).  To that
 > > end, I think it would be ok to move this into libc directly.
 > 
 > I thought it would be too expensive to check for three (actually up to
 > six, see below) in such a critical path.  Moreover, this would have
 > lowered a lot my chances to see this committed simply because very few
 > committers would have taken the responsibility for this and the time to
 > handle the debates that would have sprouted.
 > 
 > Your point for static binaries is very valid but aren't you afraid of
 > the performance impact?  I'll try to spare some time this week to move
 > libstdbuf code into libc and do some benchmarks.
 
 Hmm, I hadn't considered the performance impact, but to be honest, this
 is stdio. :)  If it only happens once when stdio is first used then I think
 this is fine to do in libc.
 
 > > One more question, do you use the same environment variable as glibc for
 > > this, or do you use a different scheme?
 > 
 > I didn't like the GNU variable names (_STDBUF_I, _STDBUF_O and
 > _STDBUF_E) so I used STDBUF_0, STDBUF_1 and STDBUF_2 instead.  But the
 > former are supported for obvious compatibility reasons.  To be honest I
 > don't really care about the names, we can use the GNU ones if you think
 > it's better to avoid doing to much strcmp(3), especially if we but the
 > code in the libc startup path.
 
 If the variable values have the same semantics, then I think it is best to 
 simply use the same names as glibc.
 
 -- 
 John Baldwin

From: Jeremie Le Hen <jeremie@le-hen.org>
To: John Baldwin <jhb@freebsd.org>
Cc: Jeremie Le Hen <jeremie@le-hen.org>, bug-followup@freebsd.org
Subject: Re: bin/166660: [libc] [patch] New util/shlib to change per-fd
 default stdio buffering mode
Date: Sat, 14 Apr 2012 15:11:31 +0200

 On Tue, Apr 10, 2012 at 09:43:16AM -0400, John Baldwin wrote:
 > On Monday, April 09, 2012 5:21:03 pm Jeremie Le Hen wrote:
 > > Hi John,
 > > 
 > > On Mon, Apr 09, 2012 at 11:30:08AM -0400, John Baldwin wrote:
 > > > I think it would be fine to do this in libc directly rather than via
 > > > LD_PRELOAD.  That would let it work for static binaries as well as
 > > > dynamic libraries.  My understanding is that this is how stdbuf works on
 > > > Linux (glibc honors the relevant magic environment variables).  To that
 > > > end, I think it would be ok to move this into libc directly.
 > > 
 > > I thought it would be too expensive to check for three (actually up to
 > > six, see below) in such a critical path.  Moreover, this would have
 > > lowered a lot my chances to see this committed simply because very few
 > > committers would have taken the responsibility for this and the time to
 > > handle the debates that would have sprouted.
 > > 
 > > Your point for static binaries is very valid but aren't you afraid of
 > > the performance impact?  I'll try to spare some time this week to move
 > > libstdbuf code into libc and do some benchmarks.
 > 
 > Hmm, I hadn't considered the performance impact, but to be honest, this
 > is stdio. :)  If it only happens once when stdio is first used then I think
 > this is fine to do in libc.
 
 I looked in the stdio source to see how I could implement there
 efficiently, but the problem is that there isn't a single entry point.
 The best I can do I think is basically something like this:
 
     int stdbuf_done = 0;
 
     void
     _stdbuf()
     {
 	/* libstdbuf code */
 	stdbuf_done = 1;
     }
 
     #define STDBUF()    if (!stdbuf_done) _stdbuf()
 
 And scatter STDBUF() all around.  What do you think of it?
 
 (FWIW, I checked how Linux implemented this, they used an additional
 shared library.)
 
 > > > One more question, do you use the same environment variable as glibc for
 > > > this, or do you use a different scheme?
 > > 
 > > I didn't like the GNU variable names (_STDBUF_I, _STDBUF_O and
 > > _STDBUF_E) so I used STDBUF_0, STDBUF_1 and STDBUF_2 instead.  But the
 > > former are supported for obvious compatibility reasons.  To be honest I
 > > don't really care about the names, we can use the GNU ones if you think
 > > it's better to avoid doing to much strcmp(3), especially if we but the
 > > code in the libc startup path.
 > 
 > If the variable values have the same semantics, then I think it is best to 
 > simply use the same names as glibc.
 
 Ok, I'll do this.
 
 -- 
 Jeremie Le Hen
 
 Men are born free and equal.  Later on, they're on their own.
 				Jean Yanne

From: John Baldwin <jhb@FreeBSD.org>
To: Jeremie Le Hen <jeremie@le-hen.org>
Cc: bug-followup@freebsd.org
Subject: Re: bin/166660: [libc] [patch] New util/shlib to change per-fd default
 stdio buffering mode
Date: Sat, 14 Apr 2012 18:16:47 -0400

 On 4/14/12 9:11 AM, Jeremie Le Hen wrote:
 > On Tue, Apr 10, 2012 at 09:43:16AM -0400, John Baldwin wrote:
 >> On Monday, April 09, 2012 5:21:03 pm Jeremie Le Hen wrote:
 >>> Hi John,
 >>>
 >>> On Mon, Apr 09, 2012 at 11:30:08AM -0400, John Baldwin wrote:
 >>>> I think it would be fine to do this in libc directly rather than via
 >>>> LD_PRELOAD.  That would let it work for static binaries as well as
 >>>> dynamic libraries.  My understanding is that this is how stdbuf works on
 >>>> Linux (glibc honors the relevant magic environment variables).  To that
 >>>> end, I think it would be ok to move this into libc directly.
 >>>
 >>> I thought it would be too expensive to check for three (actually up to
 >>> six, see below) in such a critical path.  Moreover, this would have
 >>> lowered a lot my chances to see this committed simply because very few
 >>> committers would have taken the responsibility for this and the time to
 >>> handle the debates that would have sprouted.
 >>>
 >>> Your point for static binaries is very valid but aren't you afraid of
 >>> the performance impact?  I'll try to spare some time this week to move
 >>> libstdbuf code into libc and do some benchmarks.
 >>
 >> Hmm, I hadn't considered the performance impact, but to be honest, this
 >> is stdio. :)  If it only happens once when stdio is first used then I think
 >> this is fine to do in libc.
 > 
 > I looked in the stdio source to see how I could implement there
 > efficiently, but the problem is that there isn't a single entry point.
 > The best I can do I think is basically something like this:
 > 
 >     int stdbuf_done = 0;
 > 
 >     void
 >     _stdbuf()
 >     {
 > 	/* libstdbuf code */
 > 	stdbuf_done = 1;
 >     }
 > 
 >     #define STDBUF()    if (!stdbuf_done) _stdbuf()
 > 
 > And scatter STDBUF() all around.  What do you think of it?
 > 
 > (FWIW, I checked how Linux implemented this, they used an additional
 > shared library.)
 
 Oh, ok then.  For some reason I thought it was done in the base libc
 rather than in a different shared library.
 
 -- 
 John Baldwin

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/166660: commit references a PR
Date: Sat, 28 Apr 2012 20:52:30 +0000 (UTC)

 Author: jlh
 Date: Sat Apr 28 20:52:20 2012
 New Revision: 234772
 URL: http://svn.freebsd.org/changeset/base/234772
 
 Log:
   Import stdbuf(1) and the shared library it relies on.
   This tool changes the default buffering behaviour of standard
   stdio streams.
   
   It only works on dynamic binaries.  To make it work for static
   ones it would require cluttering stdio because there no single
   entry point.
   
   PR:		166660
   Reviewed by:	current@, jhb
   Approved by:	kib (mentor)
   MFC after:	1 week
 
 Added:
   head/lib/libstdbuf/
   head/lib/libstdbuf/Makefile   (contents, props changed)
   head/lib/libstdbuf/libstdbuf.3   (contents, props changed)
   head/lib/libstdbuf/stdbuf.c   (contents, props changed)
   head/usr.bin/stdbuf/
   head/usr.bin/stdbuf/Makefile   (contents, props changed)
   head/usr.bin/stdbuf/stdbuf.1   (contents, props changed)
   head/usr.bin/stdbuf/stdbuf.c   (contents, props changed)
 Modified:
   head/lib/Makefile
   head/lib/libc/stdio/setbuf.3
   head/usr.bin/Makefile
 
 Modified: head/lib/Makefile
 ==============================================================================
 --- head/lib/Makefile	Sat Apr 28 20:34:14 2012	(r234771)
 +++ head/lib/Makefile	Sat Apr 28 20:52:20 2012	(r234772)
 @@ -104,6 +104,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
  	${_libsmdb} \
  	${_libsmutil} \
  	libstand \
 +	libstdbuf \
  	libstdthreads \
  	${_libtelnet} \
  	${_libthr} \
 
 Modified: head/lib/libc/stdio/setbuf.3
 ==============================================================================
 --- head/lib/libc/stdio/setbuf.3	Sat Apr 28 20:34:14 2012	(r234771)
 +++ head/lib/libc/stdio/setbuf.3	Sat Apr 28 20:52:20 2012	(r234772)
 @@ -83,6 +83,9 @@ normally does) it is line buffered.
  The standard error stream
  .Dv stderr
  is always unbuffered.
 +Note that these defaults maybe be altered using the
 +.Xr stdbuf 1
 +utility.
  .Pp
  The
  .Fn setvbuf
 @@ -177,6 +180,7 @@ function returns what the equivalent
  .Fn setvbuf
  would have returned.
  .Sh SEE ALSO
 +.Xr stdbuf 1 ,
  .Xr fclose 3 ,
  .Xr fopen 3 ,
  .Xr fread 3 ,
 
 Added: head/lib/libstdbuf/Makefile
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/lib/libstdbuf/Makefile	Sat Apr 28 20:52:20 2012	(r234772)
 @@ -0,0 +1,12 @@
 +# $FreeBSD$
 +
 +.include <bsd.own.mk>
 +
 +LIB=		stdbuf
 +SRCS=		stdbuf.c
 +SHLIB_MAJOR=	1
 +MAN=		libstdbuf.3
 +
 +WARNS?=		6
 +
 +.include <bsd.lib.mk>
 
 Added: head/lib/libstdbuf/libstdbuf.3
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/lib/libstdbuf/libstdbuf.3	Sat Apr 28 20:52:20 2012	(r234772)
 @@ -0,0 +1,102 @@
 +.\" Copyright (c) 2012 Jeremie Le Hen <jlh@FreeBSD.org>
 +.\" All rights reserved.
 +.\"
 +.\" Redistribution and use in source and binary forms, with or without
 +.\" modification, are permitted provided that the following conditions
 +.\" are met:
 +.\" 1. Redistributions of source code and documentation must retain the above
 +.\"    copyright notice, this list of conditions and the following disclaimer.
 +.\" 2. Redistributions in binary form must reproduce the above copyright
 +.\"    notice, this list of conditions and the following disclaimer in the
 +.\"    documentation and/or other materials provided with the distribution.
 +.\"
 +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 +.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 +.\" SUCH DAMAGE.
 +.\"
 +.\" $FreeBSD$
 +.\"
 +.Dd April 28, 2012
 +.Dt LIBSTDBUF 3
 +.Os
 +.Sh NAME
 +.Nm libstdbuf
 +.Nd preloaded library to change standard streams initial buffering
 +.Sh DESCRIPTION
 +The
 +.Nm
 +library is meant to be preloaded with the
 +.Ev LD_PRELOAD
 +environment variable to as to change the initial buffering
 +of standard input, standard output and standard error streams.
 +.Pp
 +Although you may load and configure this library manually,
 +an utility,
 +.Xr stdbuf 1 ,
 +can be used to run a command with the appropriate environment variables.
 +.Sh ENVIRONMENT
 +Each stream can be configured indepentently through the following
 +environment variables (values are defined below):
 +.Bl -tag -width size -offset indent
 +.It Ev _STDBUF_I
 +Initial buffering definition for the standard input stream
 +.It Ev _STDBUF_O
 +Initial buffering definition for the standard output stream
 +.It Ev _STDBUF_E
 +Initial buffering definition for the standard error stream
 +.El
 +.Pp
 +Each variable may take one of the following values:
 +.Bl -tag -width size -offset indent
 +.It Qq 0
 +unbuffered
 +.It Qq L
 +line buffered
 +.It Qq B
 +fully buffered with the default buffer size
 +.It Ar size
 +fully buffered with a buffer of
 +.Ar size
 +bytes (suffixes 'k', 'M' and 'G' are accepted)
 +.El
 +.Sh EXAMPLE
 +In the following example, the stdout stream of the
 +.Xr awk 1
 +command
 +will be fully buffered by default because it does not refer
 +to a terminal.
 +.Nm
 +is used to force it to be line-buffered so
 +.Xr vmstat 8 Ns 's
 +output will not stall until the full buffer fills.
 +.Bd -literal -offset indent
 +# vmstat 1 | LD_PRELOAD=/usr/lib/libstdbuf.so \\
 +    STDBUF_1=L awk '$2 > 1 || $3 > 1' | cat -n
 +.Ed
 +.Pp
 +See also the manpage of
 +.Xr stdbuf 1
 +for a simpler way to do this.
 +.Sh HISTORY
 +The
 +.Nm
 +library first appeared in
 +.Fx 8.4 .
 +.Sh AUTHORS
 +.An -nosplit
 +The original idea of the
 +.Nm
 +command comes from
 +.An Padraig Brady
 +who implemented it in the GNU coreutils.
 +.An Jeremie Le Hen
 +implemented it on
 +.Fx .
 
 Added: head/lib/libstdbuf/stdbuf.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/lib/libstdbuf/stdbuf.c	Sat Apr 28 20:52:20 2012	(r234772)
 @@ -0,0 +1,115 @@
 +/*-
 + * Copyright (c) 2012 Jeremie Le Hen <jlh@FreeBSD.org>
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 + * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 + * SUCH DAMAGE.
 + *
 + * $FreeBSD$
 + */
 +
 +#include <err.h>
 +#include <errno.h>
 +#include <limits.h>
 +#include <stdio.h>
 +#include <stdlib.h>
 +#include <string.h>
 +
 +static const char *
 +stream_name(FILE *s)
 +{
 +
 +	if (s == stdin)
 +		return "stdin";
 +	if (s == stdout)
 +		return "stdout";
 +	if (s == stderr)
 +		return "stderr";
 +	/* This should not happen. */
 +	abort();
 +}
 +
 +static void
 +change_buf(FILE *s, const char *bufmode)
 +{
 +	char *unit;
 +	size_t bufsize;
 +	int mode;
 +
 +	bufsize = 0;
 +	if (bufmode[0] == '0' && bufmode[1] == '\0')
 +		mode = _IONBF;
 +	else if (bufmode[0] == 'L' && bufmode[1] == '\0')
 +		mode = _IOLBF;
 +	else if (bufmode[0] == 'B' && bufmode[1] == '\0') {
 +		mode = _IOFBF;
 +		bufsize = 0;
 +	} else {
 +		/*
 +		 * This library being preloaded, depending on libutil
 +		 * would lead to excessive namespace pollution.
 +		 * Thus we do not use expand_number().
 +		 */
 +		errno = 0;
 +		bufsize = strtol(bufmode, &unit, 0);
 +		if (errno == EINVAL || errno == ERANGE || unit == bufmode)
 +			warn("Wrong buffer mode '%s' for %s", bufmode,
 +			    stream_name(s));
 +		switch (*unit) {
 +		case 'G':
 +			bufsize *= 1024 * 1024 * 1024;
 +			break;
 +		case 'M':
 +			bufsize *= 1024 * 1024;
 +			break;
 +		case 'k':
 +			bufsize *= 1024;
 +			break;
 +		case '\0':
 +			break;
 +		default:
 +			warnx("Unknown suffix '%c' for %s", *unit,
 +			    stream_name(s));
 +			return;
 +		}
 +		mode = _IOFBF;
 +	}
 +	if (setvbuf(s, NULL, mode, bufsize) != 0)
 +		warn("Cannot set buffer mode '%s' for %s", bufmode,
 +		    stream_name(s));
 +}
 +
 +__attribute__ ((constructor)) static void
 +stdbuf(void)
 +{
 +	char *i_mode, *o_mode, *e_mode;
 +
 +	i_mode = getenv("_STDBUF_I");
 +	o_mode = getenv("_STDBUF_O");
 +	e_mode = getenv("_STDBUF_E");
 +
 +	if (e_mode != NULL)
 +		change_buf(stderr, e_mode);
 +	if (i_mode != NULL)
 +		change_buf(stdin, i_mode);
 +	if (o_mode != NULL)
 +		change_buf(stdout, o_mode);
 +}
 
 Modified: head/usr.bin/Makefile
 ==============================================================================
 --- head/usr.bin/Makefile	Sat Apr 28 20:34:14 2012	(r234771)
 +++ head/usr.bin/Makefile	Sat Apr 28 20:52:20 2012	(r234772)
 @@ -143,6 +143,7 @@ SUBDIR=	alias \
  	sockstat \
  	split \
  	stat \
 +	stdbuf \
  	su \
  	systat \
  	tabs \
 
 Added: head/usr.bin/stdbuf/Makefile
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/usr.bin/stdbuf/Makefile	Sat Apr 28 20:52:20 2012	(r234772)
 @@ -0,0 +1,8 @@
 +# $FreeBSD$
 +
 +PROG=   stdbuf
 +SRCS=   stdbuf.c
 +
 +WARNS?=	6
 +
 +.include <bsd.prog.mk>
 
 Added: head/usr.bin/stdbuf/stdbuf.1
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/usr.bin/stdbuf/stdbuf.1	Sat Apr 28 20:52:20 2012	(r234772)
 @@ -0,0 +1,116 @@
 +.\" Copyright (c) 2012 Jeremie Le Hen <jlh@FreeBSD.org>
 +.\" All rights reserved.
 +.\"
 +.\" Redistribution and use in source and binary forms, with or without
 +.\" modification, are permitted provided that the following conditions
 +.\" are met:
 +.\" 1. Redistributions of source code and documentation must retain the above
 +.\"    copyright notice, this list of conditions and the following disclaimer.
 +.\" 2. Redistributions in binary form must reproduce the above copyright
 +.\"    notice, this list of conditions and the following disclaimer in the
 +.\"    documentation and/or other materials provided with the distribution.
 +.\"
 +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 +.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 +.\" SUCH DAMAGE.
 +.\"
 +.\" $FreeBSD$
 +.\"
 +.Dd April 28, 2012
 +.Dt STDBUF 1
 +.Os
 +.Sh NAME
 +.Nm stdbuf
 +.Nd change standard streams initial buffering
 +.Sh SYNOPSIS
 +.Nm
 +.Op Fl e Ar bufdef
 +.Op Fl i Ar bufdef
 +.Op Fl o Ar bufdef
 +.Op Ar command Op ...
 +.Sh DESCRIPTION
 +.Nm
 +is used to change the initial buffering of standard input,
 +standard output and/or standard error streams for
 +.Ar command .
 +It relies on
 +.Xr libstdbuf 3
 +which is loaded and configured by
 +.Nm
 +through environment variables.
 +.Pp
 +The options are as follows:
 +.Bl -tag -width Ds
 +.It Fl e Ar bufdef
 +Set initial buffering of the standard error stream for
 +.Ar command
 +as defined by
 +.Ar bufdef
 +.Pq see Sx BUFFER DEFINITION .
 +.It Fl i Ar bufdef
 +Set initial buffering of the standard input stream for
 +.Ar command
 +as defined by
 +.Ar bufdef
 +.Pq see Sx BUFFER DEFINITION .
 +.It Fl o Ar bufdef
 +Set initial buffering of the standard output stream for
 +.Ar command
 +as defined by
 +.Ar bufdef
 +.Pq see Sx BUFFER DEFINITION .
 +.El
 +.Sh BUFFER DEFINITION
 +Buffer definition is the same as in
 +.Xr libstdbuf 3 :
 +.Bl -tag -width size -offset indent
 +.It Qq 0
 +unbuffered
 +.It Qq L
 +line buffered
 +.It Qq B
 +fully buffered with the default buffer size
 +.It Ar size
 +fully buffered with a buffer of
 +.Ar size
 +bytes (suffixes 'k', 'M' and 'G' are accepted)
 +.El
 +.Sh EXAMPLES
 +In the following example, the stdout stream of the
 +.Xr awk 1
 +command
 +will be fully buffered by default because it does not refer
 +to a terminal.
 +.Nm
 +is used to force it to be line-buffered so
 +.Xr vmstat 8 Ns 's
 +output will not stall until the full buffer fills.
 +.Bd -literal -offset indent
 +# vmstat 1 | stdbuf -o L awk '$2 > 1 || $3 > 1' | cat -n
 +.Ed
 +.Sh SEE ALSO
 +.Xr libstdbuf 3 ,
 +.Xr setvbuf 3
 +.Sh HISTORY
 +The
 +.Nm
 +utility first appeared in
 +.Fx 8.4 .
 +.Sh AUTHORS
 +.An -nosplit
 +The original idea of the
 +.Nm
 +command comes from 
 +.An Padraig Brady
 +who implemented it in the GNU coreutils.
 +.An Jeremie Le Hen
 +implemented it on
 +.Fx .
 
 Added: head/usr.bin/stdbuf/stdbuf.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/usr.bin/stdbuf/stdbuf.c	Sat Apr 28 20:52:20 2012	(r234772)
 @@ -0,0 +1,104 @@
 +/*-
 + * Copyright (c) 2012 Jeremie Le Hen <jlh@FreeBSD.org>
 + * All rights reserved.
 + *
 + * Redistribution and use in source and binary forms, with or without
 + * modification, are permitted provided that the following conditions
 + * are met:
 + * 1. Redistributions of source code must retain the above copyright
 + *    notice, this list of conditions and the following disclaimer.
 + * 2. Redistributions in binary form must reproduce the above copyright
 + *    notice, this list of conditions and the following disclaimer in the
 + *    documentation and/or other materials provided with the distribution.
 + *
 + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 + * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 + * SUCH DAMAGE.
 + *
 + * $FreeBSD$
 + */
 +
 +#include <err.h>
 +#include <stdio.h>
 +#include <stdlib.h>
 +#include <unistd.h>
 +
 +#define	LIBSTDBUF	"/usr/lib/libstdbuf.so"
 +
 +extern char *__progname;
 +
 +static void
 +usage(int s)
 +{
 +	
 +	fprintf(stderr, "Usage: %s [-e 0|L|<sz>] [-i 0|L|<sz>] [-o 0|L|<sz>] "
 +	    "<cmd> [args ...]\n", __progname);
 +	exit(s);
 +}
 +
 +int
 +main(int argc, char *argv[])
 +{
 +	char *ibuf, *obuf, *ebuf;
 +	char *preload0, *preload1;
 +	int i;
 +
 +	ibuf = obuf = ebuf = NULL;
 +	while ((i = getopt(argc, argv, ":e:i:o:")) != -1) {
 +		switch (i) {
 +		case 'e':
 +			ebuf = optarg;
 +			break;
 +		case 'i':
 +			ibuf = optarg;
 +			break;
 +		case 'o':
 +			obuf = optarg;
 +			break;
 +		case ':':
 +			warnx("Missing argument for option -%c", optopt);
 +			usage(1);
 +			break;
 +		case '?':
 +		default:
 +			warnx("Unknown option: %c", optopt);
 +			usage(1);
 +			break;
 +		}
 +	}
 +	argc -= optind;
 +	argv += optind;
 +	if (argc < 2)
 +		usage(0);
 +
 +	if (ibuf != NULL && setenv("_STDBUF_I", ibuf, 1) == -1)
 +		warn("Failed to set environment variable: %s=%s",
 +		    "_STDBUF_I", ibuf);
 +	if (obuf != NULL && setenv("_STDBUF_O", obuf, 1) == -1)
 +		warn("Failed to set environment variable: %s=%s",
 +		    "_STDBUF_O", obuf);
 +	if (ebuf != NULL && setenv("_STDBUF_E", ebuf, 1) == -1)
 +		warn("Failed to set environment variable: %s=%s",
 +		    "_STDBUF_E", ebuf);
 +
 +	preload0 = getenv("LD_PRELOAD");
 +	if (preload0 == NULL)
 +		i = asprintf(&preload1, "LD_PRELOAD=" LIBSTDBUF);
 +	else
 +		i = asprintf(&preload1, "LD_PRELOAD=%s:%s", preload0,
 +		    LIBSTDBUF);
 +
 +	if (i < 0 || putenv(preload1) == -1)
 +		warn("Failed to set environment variable: %s", preload1);
 +
 +	execvp(argv[0], argv);
 +	err(2, "%s", argv[0]);
 +}
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: jlh 
State-Changed-When: Sat Apr 28 22:49:23 UTC 2012 
State-Changed-Why:  
Committed in head as r234773. 


Responsible-Changed-From-To: freebsd-bugs->jlh 
Responsible-Changed-By: jlh 
Responsible-Changed-When: Sat Apr 28 22:49:23 UTC 2012 
Responsible-Changed-Why:  
Committed in head as r234773. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166660 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/166660: commit references a PR
Date: Tue,  8 May 2012 16:37:20 +0000 (UTC)

 Author: jlh
 Date: Tue May  8 16:36:32 2012
 New Revision: 235139
 URL: http://svn.freebsd.org/changeset/base/235139
 
 Log:
   MFC r234772:
     Import stdbuf(1) and the shared library it relies on.
     This tool changes the default buffering behaviour of standard
     stdio streams.
   
     It only works on dynamic binaries.  To make it work for static
     ones it would require cluttering stdio because there no single
     entry point.
   
     PR:		166660
     Reviewed by:	current@, jhb
     Approved by:	kib (mentor)
     MFC after:	1 week
   
   MFC r234773:
     Fix small documentation mistakes.
   
     Submitted by:	brueffer
     Approved by:	kib (mentor)
   
   MFC r234779:
     Use standard getopt(3) error message.
   
     Submitted by:	jilles
     Approved by:	kib (mentor)
 
 Added:
      - copied from r234772, head/lib/libstdbuf/
      - copied from r234772, head/usr.bin/stdbuf/
 Directory Properties:
   stable/9/lib/libstdbuf/   (props changed)
   stable/9/usr.bin/stdbuf/   (props changed)
 Modified:
   stable/9/lib/Makefile
   stable/9/lib/libc/stdio/setbuf.3
   stable/9/lib/libstdbuf/libstdbuf.3
   stable/9/usr.bin/Makefile
   stable/9/usr.bin/stdbuf/stdbuf.c
 Directory Properties:
   stable/9/lib/   (props changed)
   stable/9/lib/libc/   (props changed)
   stable/9/usr.bin/   (props changed)
 
 Modified: stable/9/lib/Makefile
 ==============================================================================
 --- stable/9/lib/Makefile	Tue May  8 15:18:35 2012	(r235138)
 +++ stable/9/lib/Makefile	Tue May  8 16:36:32 2012	(r235139)
 @@ -100,6 +100,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
  	${_libsmdb} \
  	${_libsmutil} \
  	libstand \
 +	libstdbuf \
  	${_libtelnet} \
  	${_libthr} \
  	libthread_db \
 
 Modified: stable/9/lib/libc/stdio/setbuf.3
 ==============================================================================
 --- stable/9/lib/libc/stdio/setbuf.3	Tue May  8 15:18:35 2012	(r235138)
 +++ stable/9/lib/libc/stdio/setbuf.3	Tue May  8 16:36:32 2012	(r235139)
 @@ -83,6 +83,9 @@ normally does) it is line buffered.
  The standard error stream
  .Dv stderr
  is always unbuffered.
 +Note that these defaults may be altered using the
 +.Xr stdbuf 1
 +utility.
  .Pp
  The
  .Fn setvbuf
 @@ -177,6 +180,7 @@ function returns what the equivalent
  .Fn setvbuf
  would have returned.
  .Sh SEE ALSO
 +.Xr stdbuf 1 ,
  .Xr fclose 3 ,
  .Xr fopen 3 ,
  .Xr fread 3 ,
 
 Modified: stable/9/lib/libstdbuf/libstdbuf.3
 ==============================================================================
 --- head/lib/libstdbuf/libstdbuf.3	Sat Apr 28 20:52:20 2012	(r234772)
 +++ stable/9/lib/libstdbuf/libstdbuf.3	Tue May  8 16:36:32 2012	(r235139)
 @@ -43,7 +43,7 @@ an utility,
  .Xr stdbuf 1 ,
  can be used to run a command with the appropriate environment variables.
  .Sh ENVIRONMENT
 -Each stream can be configured indepentently through the following
 +Each stream can be configured independently through the following
  environment variables (values are defined below):
  .Bl -tag -width size -offset indent
  .It Ev _STDBUF_I
 
 Modified: stable/9/usr.bin/Makefile
 ==============================================================================
 --- stable/9/usr.bin/Makefile	Tue May  8 15:18:35 2012	(r235138)
 +++ stable/9/usr.bin/Makefile	Tue May  8 16:36:32 2012	(r235139)
 @@ -143,6 +143,7 @@ SUBDIR=	alias \
  	sockstat \
  	split \
  	stat \
 +	stdbuf \
  	su \
  	systat \
  	tabs \
 
 Modified: stable/9/usr.bin/stdbuf/stdbuf.c
 ==============================================================================
 --- head/usr.bin/stdbuf/stdbuf.c	Sat Apr 28 20:52:20 2012	(r234772)
 +++ stable/9/usr.bin/stdbuf/stdbuf.c	Tue May  8 16:36:32 2012	(r235139)
 @@ -52,7 +52,7 @@ main(int argc, char *argv[])
  	int i;
  
  	ibuf = obuf = ebuf = NULL;
 -	while ((i = getopt(argc, argv, ":e:i:o:")) != -1) {
 +	while ((i = getopt(argc, argv, "e:i:o:")) != -1) {
  		switch (i) {
  		case 'e':
  			ebuf = optarg;
 @@ -63,13 +63,8 @@ main(int argc, char *argv[])
  		case 'o':
  			obuf = optarg;
  			break;
 -		case ':':
 -			warnx("Missing argument for option -%c", optopt);
 -			usage(1);
 -			break;
  		case '?':
  		default:
 -			warnx("Unknown option: %c", optopt);
  			usage(1);
  			break;
  		}
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/166660: commit references a PR
Date: Tue,  8 May 2012 19:33:51 +0000 (UTC)

 Author: jlh
 Date: Tue May  8 19:33:31 2012
 New Revision: 235141
 URL: http://svn.freebsd.org/changeset/base/235141
 
 Log:
   MFC r234772:
     Import stdbuf(1) and the shared library it relies on.
     This tool changes the default buffering behaviour of standard
     stdio streams.
   
     It only works on dynamic binaries.  To make it work for static
     ones it would require cluttering stdio because there no single
     entry point.
   
     PR:		166660
     Reviewed by:	current@, jhb
     Approved by:	kib (mentor)
     MFC after:	1 week
   
   MFC r234773:
     Fix small documentation mistakes.
   
     Submitted by:	brueffer
     Approved by:	kib (mentor)
   
   MFC r234779:
     Use standard getopt(3) error message.
   
     Submitted by:	jilles
     Approved by:	kib (mentor)
 
 Added:
      - copied from r234772, head/lib/libstdbuf/
      - copied from r234772, head/usr.bin/stdbuf/
 Directory Properties:
   stable/8/lib/libstdbuf/   (props changed)
   stable/8/usr.bin/stdbuf/   (props changed)
 Modified:
   stable/8/lib/Makefile   (contents, props changed)
   stable/8/lib/libc/stdio/setbuf.3
   stable/8/lib/libstdbuf/libstdbuf.3
   stable/8/usr.bin/Makefile
   stable/8/usr.bin/stdbuf/stdbuf.c
 Directory Properties:
   stable/8/lib/   (props changed)
   stable/8/lib/libc/   (props changed)
   stable/8/usr.bin/   (props changed)
 
 Modified: stable/8/lib/Makefile
 ==============================================================================
 --- stable/8/lib/Makefile	Tue May  8 18:56:21 2012	(r235140)
 +++ stable/8/lib/Makefile	Tue May  8 19:33:31 2012	(r235141)
 @@ -95,6 +95,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
  	${_libsmdb} \
  	${_libsmutil} \
  	libstand \
 +	libstdbuf \
  	${_libtelnet} \
  	${_libthr} \
  	libthread_db \
 
 Modified: stable/8/lib/libc/stdio/setbuf.3
 ==============================================================================
 --- stable/8/lib/libc/stdio/setbuf.3	Tue May  8 18:56:21 2012	(r235140)
 +++ stable/8/lib/libc/stdio/setbuf.3	Tue May  8 19:33:31 2012	(r235141)
 @@ -83,6 +83,9 @@ normally does) it is line buffered.
  The standard error stream
  .Dv stderr
  is always unbuffered.
 +Note that these defaults may be altered using the
 +.Xr stdbuf 1
 +utility.
  .Pp
  The
  .Fn setvbuf
 @@ -177,6 +180,7 @@ function returns what the equivalent
  .Fn setvbuf
  would have returned.
  .Sh SEE ALSO
 +.Xr stdbuf 1 ,
  .Xr fclose 3 ,
  .Xr fopen 3 ,
  .Xr fread 3 ,
 
 Modified: stable/8/lib/libstdbuf/libstdbuf.3
 ==============================================================================
 --- head/lib/libstdbuf/libstdbuf.3	Sat Apr 28 20:52:20 2012	(r234772)
 +++ stable/8/lib/libstdbuf/libstdbuf.3	Tue May  8 19:33:31 2012	(r235141)
 @@ -43,7 +43,7 @@ an utility,
  .Xr stdbuf 1 ,
  can be used to run a command with the appropriate environment variables.
  .Sh ENVIRONMENT
 -Each stream can be configured indepentently through the following
 +Each stream can be configured independently through the following
  environment variables (values are defined below):
  .Bl -tag -width size -offset indent
  .It Ev _STDBUF_I
 
 Modified: stable/8/usr.bin/Makefile
 ==============================================================================
 --- stable/8/usr.bin/Makefile	Tue May  8 18:56:21 2012	(r235140)
 +++ stable/8/usr.bin/Makefile	Tue May  8 19:33:31 2012	(r235141)
 @@ -177,6 +177,7 @@ SUBDIR=	alias \
  	sockstat \
  	split \
  	stat \
 +	stdbuf \
  	su \
  	systat \
  	tabs \
 
 Modified: stable/8/usr.bin/stdbuf/stdbuf.c
 ==============================================================================
 --- head/usr.bin/stdbuf/stdbuf.c	Sat Apr 28 20:52:20 2012	(r234772)
 +++ stable/8/usr.bin/stdbuf/stdbuf.c	Tue May  8 19:33:31 2012	(r235141)
 @@ -52,7 +52,7 @@ main(int argc, char *argv[])
  	int i;
  
  	ibuf = obuf = ebuf = NULL;
 -	while ((i = getopt(argc, argv, ":e:i:o:")) != -1) {
 +	while ((i = getopt(argc, argv, "e:i:o:")) != -1) {
  		switch (i) {
  		case 'e':
  			ebuf = optarg;
 @@ -63,13 +63,8 @@ main(int argc, char *argv[])
  		case 'o':
  			obuf = optarg;
  			break;
 -		case ':':
 -			warnx("Missing argument for option -%c", optopt);
 -			usage(1);
 -			break;
  		case '?':
  		default:
 -			warnx("Unknown option: %c", optopt);
  			usage(1);
  			break;
  		}
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: jlh 
State-Changed-When: Tue May 8 19:45:23 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166660 
>Unformatted:
