From 85ab7ba1e0e4e1e97bb70d4aef7710ec8bc55b3a Mon Sep 17 00:00:00 2001
From: Sheldon Hearn <sheldonh@FreeBSD.org>
Date: Fri, 27 Aug 1999 08:59:32 +0000
Subject: [PATCH] Add ``-i'' option, which is the same as ``-''. The -i option
 is the recommended option in the manpage, but the - option remains for
 backward compatibility and is documented as such.

PR:	13363
Reported by:	James Howard <howardjp@wam.umd.edu>
Reviewed by:	bde
---
 usr.bin/env/env.c           |  5 +++--
 usr.bin/printenv/printenv.1 | 22 ++++++++++++++++------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/usr.bin/env/env.c b/usr.bin/env/env.c
index a5083fbc681e..42ec003abf26 100644
--- a/usr.bin/env/env.c
+++ b/usr.bin/env/env.c
@@ -60,9 +60,10 @@ main(argc, argv)
 	char *cleanenv[1];
 	int ch;
 
-	while ((ch = getopt(argc, argv, "-")) != -1)
+	while ((ch = getopt(argc, argv, "-i")) != -1)
 		switch(ch) {
 		case '-':
+		case 'i':
 			environ = cleanenv;
 			cleanenv[0] = NULL;
 			break;
@@ -85,6 +86,6 @@ static void
 usage()
 {
 	(void)fprintf(stderr,
-	    "usage: env [-] [name=value ...] [command]\n");
+	    "usage: env [-] [-i] [name=value ...] [command]\n");
 	exit(1);
 }
diff --git a/usr.bin/printenv/printenv.1 b/usr.bin/printenv/printenv.1
index b1ceb5a7f174..d3f8a145d4e0 100644
--- a/usr.bin/printenv/printenv.1
+++ b/usr.bin/printenv/printenv.1
@@ -32,7 +32,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)printenv.1	8.1 (Berkeley) 6/6/93
-.\"	$Id$
+.\"	$Id: printenv.1,v 1.3 1999/07/12 20:23:52 nik Exp $
 .\"
 .Dd June 6, 1993
 .Dt PRINTENV 1
@@ -45,6 +45,7 @@
 .Op Ar name
 .Nm env
 .Op Fl
+.Op Fl i
 .Op Ar name=value ...
 .Op Ar command
 .Sh DESCRIPTION
@@ -72,12 +73,21 @@ an environment variable,
 .Ar name  ,
 with a value of
 .Ar value  .
-The option
-.Sq Fl
-causes
+.Pp
+The options are as follows:
+.Bl -tag -width indent
+.It Fl i
+Execute the
+.Ar command
+with only those environment values specified. The environment inherited
+by
 .Nm env
-to completely ignore the environment
-it inherits.
+is ignored completely.
+.It Fl
+Identical to the
+.Fl i
+option, available for backward compatibility.
+.El
 .Pp
 If no command is specified,
 .Nm env