Author: jlh
Date: Fri Feb 8 22:13:20 2013
New Revision: 246566
URL: http://svnweb.freebsd.org/changeset/base/246566
Log:
MFC r245418:
Allow commands without any additional arguments, as stated in the
manpage. While here, exit early when there is nothing to do.
PR: 168415
Submitted by: Zhihao Yuan (initial version)
MFC r245419:
Remove stray tabs.
Submitted by: kib
Modified:
stable/9/usr.bin/stdbuf/stdbuf.c
Directory Properties:
stable/9/usr.bin/stdbuf/ (props changed)
Modified: stable/9/usr.bin/stdbuf/stdbuf.c
==============================================================================
--- stable/9/usr.bin/stdbuf/stdbuf.c Fri Feb 8 21:15:47 2013
(r246565)
+++ stable/9/usr.bin/stdbuf/stdbuf.c Fri Feb 8 22:13:20 2013
(r246566)
@@ -39,7 +39,7 @@ 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);
@@ -72,8 +72,8 @@ main(int argc, char *argv[])
}
argc -= optind;
argv += optind;
- if (argc < 2)
- usage(0);
+ if (argc == 0)
+ exit(0);
if (ibuf != NULL && setenv("_STDBUF_I", ibuf, 1) == -1)
warn("Failed to set environment variable: %s=%s",
@@ -94,7 +94,7 @@ main(int argc, char *argv[])
if (i < 0 || putenv(preload1) == -1)
warn("Failed to set environment variable: LD_PRELOAD");
-
+
preload0 = getenv("LD_32_PRELOAD");
if (preload0 == NULL)
i = asprintf(&preload1, "LD_32_PRELOAD=" LIBSTDBUF32);
_______________________________________________
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-unsubscr...@freebsd.org"
