1 files changed, 38 insertions, 42 deletions
diff --git a/src/lib/libc/stdlib/getenv.3 b/src/lib/libc/stdlib/getenv.3
index 411eb35da4..f131bbf513 100644
--- a/src/lib/libc/stdlib/getenv.3
+++ b/src/lib/libc/stdlib/getenv.3
@@ -1,5 +1,5 @@
-.\" Copyright (c) 1988, 1991 The Regents of the University of California.
+.\" Copyright (c) 1988, 1991, 1993
-.\" All rights reserved.
+.\"    The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" the American National Standards Committee X3, on Information
@@ -13,11 +13,7 @@
 .\" 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
+.\" 3. Neither the name of the University nor the names of its contributors
-.\"    must display the following acknowledgement:
-.\"     This product includes software developed by the University of
-.\"     California, Berkeley and its contributors.
-.\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
 .\"
@@ -33,10 +29,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)getenv.3      6.11 (Berkeley) 6/29/91
+.\"     $OpenBSD: getenv.3,v 1.11 2005/07/26 04:20:23 jaredy Exp $
-.\"     $Id: getenv.3,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $
 .\"
-.Dd June 29, 1991
+.Dd December 11, 1993
 .Dt GETENV 3
 .Os
 .Sh NAME
@@ -56,59 +51,51 @@
 .Ft void
 .Fn unsetenv "const char *name"
 .Sh DESCRIPTION
-These functions set, unset and fetch environment variables from the
+These functions set, unset, and fetch environment variables from the host
-host
 .Em environment list .
-For compatibility with differing environment conventions,
+For compatibility with differing environment conventions, the given arguments
-the given arguments
+.Fa name
-.Ar name
 and
-.Ar value
+.Fa value
-may be appended and prepended, 
+may be appended and prepended, respectively, with an equal sign
-respectively,
-with an equal sign
 .Dq Li \&= .
 .Pp
 The
 .Fn getenv
-function obtains the current value of the environment variable,
+function obtains the current value of the environment variable
-.Ar name .
+.Fa name .
 If the variable
-.Ar name
+.Fa name
-is not in the current environment ,
+is not in the current environment, a null pointer is returned.
-a null pointer is returned.
 .Pp
 The
 .Fn setenv
 function inserts or resets the environment variable
-.Ar name
+.Fa name
 in the current environment list.
 If the variable
-.Ar name
+.Fa name
-does not exist in the list,
+does not exist in the list, it is inserted with the given
-it is inserted with the given
+.Fa value .
-.Ar value.
 If the variable does exist, the argument
-.Ar overwrite
+.Fa overwrite
 is tested; if
-.Ar overwrite is
+.Fa overwrite
-zero, the
+is zero, the variable is not reset, otherwise it is reset to the given
-variable is not reset, otherwise it is reset
+.Fa value .
-to the given
-.Ar value .
 .Pp
 The
 .Fn putenv
-function takes an argument of the form ``name=value'' and is
+function takes an argument of the form
-equivalent to:
+.Ar name Ns = Ns Ar value
+and is equivalent to:
 .Bd -literal -offset indent
 setenv(name, value, 1);
 .Ed
 .Pp
 The
 .Fn unsetenv
-function
+function deletes all instances of the variable name pointed to by
-deletes all instances of the variable name pointed to by
 .Fa name
 from the list.
 .Sh RETURN VALUES
@@ -118,8 +105,11 @@ and
 .Fn putenv
 return zero if successful; otherwise the global variable
 .Va errno
-is set to indicate the error and a
+is set to indicate the error and \-1 is returned.
-\-1 is returned.
+.Pp
+If
+.Fn getenv
+is successful, the string returned should be considered read-only.
 .Sh ERRORS
 .Bl -tag -width Er
 .It Bq Er ENOMEM
@@ -140,12 +130,18 @@ The
 function conforms to
 .St -ansiC .
 .Sh HISTORY
+The function
+.Fn getenv
+appeared in
+.At v7
+and
+.Bx 3 .
 The functions
 .Fn setenv
 and
 .Fn unsetenv
 appeared in
-.At v7 .
+.Bx 4.3 Tahoe .
 The
 .Fn putenv
 function appeared in

diff --git a/src/lib/libc/stdlib/getenv.3 b/src/lib/libc/stdlib/getenv.3 index 411eb35da4..f131bbf513 100644 --- a/src/lib/libc/stdlib/getenv.3 +++ b/src/lib/libc/stdlib/getenv.3
@@ -1,5 +1,5 @@
1	.\" Copyright (c) 1988, 1991 The Regents of the University of California.	1	.\" Copyright (c) 1988, 1991, 1993
2	.\" All rights reserved.	2	.\" The Regents of the University of California. All rights reserved.
3	.\"	3	.\"
4	.\" This code is derived from software contributed to Berkeley by	4	.\" This code is derived from software contributed to Berkeley by
5	.\" the American National Standards Committee X3, on Information	5	.\" the American National Standards Committee X3, on Information
@@ -13,11 +13,7 @@
13	.\" 2. Redistributions in binary form must reproduce the above copyright	13	.\" 2. Redistributions in binary form must reproduce the above copyright
14	.\" notice, this list of conditions and the following disclaimer in the	14	.\" notice, this list of conditions and the following disclaimer in the
15	.\" documentation and/or other materials provided with the distribution.	15	.\" documentation and/or other materials provided with the distribution.
16	.\" 3. All advertising materials mentioning features or use of this software	16	.\" 3. Neither the name of the University nor the names of its contributors
17	.\" must display the following acknowledgement:
18	.\" This product includes software developed by the University of
19	.\" California, Berkeley and its contributors.
20	.\" 4. Neither the name of the University nor the names of its contributors
21	.\" may be used to endorse or promote products derived from this software	17	.\" may be used to endorse or promote products derived from this software
22	.\" without specific prior written permission.	18	.\" without specific prior written permission.
23	.\"	19	.\"
@@ -33,10 +29,9 @@
33	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF	29	.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34	.\" SUCH DAMAGE.	30	.\" SUCH DAMAGE.
35	.\"	31	.\"
36	.\" from: @(#)getenv.3 6.11 (Berkeley) 6/29/91	32	.\" $OpenBSD: getenv.3,v 1.11 2005/07/26 04:20:23 jaredy Exp $
37	.\" $Id: getenv.3,v 1.1.1.1 1995/10/18 08:42:17 deraadt Exp $
38	.\"	33	.\"
39	.Dd June 29, 1991	34	.Dd December 11, 1993
40	.Dt GETENV 3	35	.Dt GETENV 3
41	.Os	36	.Os
42	.Sh NAME	37	.Sh NAME
@@ -56,59 +51,51 @@
56	.Ft void	51	.Ft void
57	.Fn unsetenv "const char *name"	52	.Fn unsetenv "const char *name"
58	.Sh DESCRIPTION	53	.Sh DESCRIPTION
59	These functions set, unset and fetch environment variables from the	54	These functions set, unset, and fetch environment variables from the host
60	host
61	.Em environment list .	55	.Em environment list .
62	For compatibility with differing environment conventions,	56	For compatibility with differing environment conventions, the given arguments
63	the given arguments	57	.Fa name
64	.Ar name
65	and	58	and
66	.Ar value	59	.Fa value
67	may be appended and prepended,	60	may be appended and prepended, respectively, with an equal sign
68	respectively,
69	with an equal sign
70	.Dq Li \&= .	61	.Dq Li \&= .
71	.Pp	62	.Pp
72	The	63	The
73	.Fn getenv	64	.Fn getenv
74	function obtains the current value of the environment variable,	65	function obtains the current value of the environment variable
75	.Ar name .	66	.Fa name .
76	If the variable	67	If the variable
77	.Ar name	68	.Fa name
78	is not in the current environment ,	69	is not in the current environment, a null pointer is returned.
79	a null pointer is returned.
80	.Pp	70	.Pp
81	The	71	The
82	.Fn setenv	72	.Fn setenv
83	function inserts or resets the environment variable	73	function inserts or resets the environment variable
84	.Ar name	74	.Fa name
85	in the current environment list.	75	in the current environment list.
86	If the variable	76	If the variable
87	.Ar name	77	.Fa name
88	does not exist in the list,	78	does not exist in the list, it is inserted with the given
89	it is inserted with the given	79	.Fa value .
90	.Ar value.
91	If the variable does exist, the argument	80	If the variable does exist, the argument
92	.Ar overwrite	81	.Fa overwrite
93	is tested; if	82	is tested; if
94	.Ar overwrite is	83	.Fa overwrite
95	zero, the	84	is zero, the variable is not reset, otherwise it is reset to the given
96	variable is not reset, otherwise it is reset	85	.Fa value .
97	to the given
98	.Ar value .
99	.Pp	86	.Pp
100	The	87	The
101	.Fn putenv	88	.Fn putenv
102	function takes an argument of the form ``name=value'' and is	89	function takes an argument of the form
103	equivalent to:	90	.Ar name Ns = Ns Ar value
		91	and is equivalent to:
104	.Bd -literal -offset indent	92	.Bd -literal -offset indent
105	setenv(name, value, 1);	93	setenv(name, value, 1);
106	.Ed	94	.Ed
107	.Pp	95	.Pp
108	The	96	The
109	.Fn unsetenv	97	.Fn unsetenv
110	function	98	function deletes all instances of the variable name pointed to by
111	deletes all instances of the variable name pointed to by
112	.Fa name	99	.Fa name
113	from the list.	100	from the list.
114	.Sh RETURN VALUES	101	.Sh RETURN VALUES
@@ -118,8 +105,11 @@ and
118	.Fn putenv	105	.Fn putenv
119	return zero if successful; otherwise the global variable	106	return zero if successful; otherwise the global variable
120	.Va errno	107	.Va errno
121	is set to indicate the error and a	108	is set to indicate the error and \-1 is returned.
122	\-1 is returned.	109	.Pp
		110	If
		111	.Fn getenv
		112	is successful, the string returned should be considered read-only.
123	.Sh ERRORS	113	.Sh ERRORS
124	.Bl -tag -width Er	114	.Bl -tag -width Er
125	.It Bq Er ENOMEM	115	.It Bq Er ENOMEM
@@ -140,12 +130,18 @@ The
140	function conforms to	130	function conforms to
141	.St -ansiC .	131	.St -ansiC .
142	.Sh HISTORY	132	.Sh HISTORY
		133	The function
		134	.Fn getenv
		135	appeared in
		136	.At v7
		137	and
		138	.Bx 3 .
143	The functions	139	The functions
144	.Fn setenv	140	.Fn setenv
145	and	141	and
146	.Fn unsetenv	142	.Fn unsetenv
147	appeared in	143	appeared in
148	.At v7 .	144	.Bx 4.3 Tahoe .
149	The	145	The
150	.Fn putenv	146	.Fn putenv
151	function appeared in	147	function appeared in