1003.1-2001 has introduced unsetenv() which differs from the current

implementation in not permitting a "name=value" argument.
* Add a conforming __unsetenv13() and do function renaming for
  unsetenv(); preserve old symbol with old behavior.
* Make visible setenv() and unsetenv() for 1003.1-2001 feature selection
  macros; resolves PR standards/20479.

include/stdlib.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: stdlib.h,v 1.58 2003/03/01 15:59:02 bjh21 Exp $	*/
+/*	$NetBSD: stdlib.h,v 1.59 2003/04/07 13:41:13 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -220,6 +220,21 @@ unsigned long long int
 		    int));
 #endif
 
+/*
+ * X/Open CAE Specification Issue 6; IEEE Std 1003.1-2001 (POSIX)
+ */
+#if (!defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)) || \
+    (_POSIX_C_SOURCE - 0) >= 200112L || \
+    (_XOPEN_SOURCE - 0) >= 600
+int	 setenv __P((const char *, const char *, int));
+#ifdef __LIBC12_SOURCE__
+void	 unsetenv __P((const char *));
+int	 __unsetenv13 __P((const char *));
+#else
+int	 unsetenv __P((const char *))		__RENAME(__unsetenv13);
+#endif
+#endif
+
 /*
  * Implementation-defined extensions
  */
@@ -260,8 +275,6 @@ int	 radixsort __P((const unsigned char **, int, const unsigned char *,
 int	 sradixsort __P((const unsigned char **, int, const unsigned char *,
 	    unsigned));
 
-int	 setenv __P((const char *, const char *, int));
-void	 unsetenv __P((const char *));
 void	 setproctitle __P((const char *, ...))
 	    __attribute__((__format__(__printf__, 1, 2)));
 const char *getprogname __P((void)) __attribute__((__const__));

lib/libc/stdlib/__unsetenv13.c

@@ -0,0 +1,100 @@
+/*	$NetBSD: __unsetenv13.c,v 1.1 2003/04/07 13:41:14 kleink Exp $	*/
+
+/*
+ * Copyright (c) 1987, 1993
+ *	The Regents of the University of California.  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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ */
+
+#include <sys/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+#if 0
+static char sccsid[] = "from: @(#)setenv.c	8.1 (Berkeley) 6/4/93";
+#else
+__RCSID("$NetBSD: __unsetenv13.c,v 1.1 2003/04/07 13:41:14 kleink Exp $");
+#endif
+#endif /* LIBC_SCCS and not lint */
+
+#include "namespace.h"
+
+#include <assert.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include "local.h"
+#include "reentrant.h"
+
+#ifdef __weak_alias
+#ifdef __LIBC12_SOURCE__
+__weak_alias(unsetenv,_unsetenv)
+#endif
+#endif
+
+#ifdef _REENTRANT
+extern rwlock_t __environ_lock;
+#endif
+
+extern char **environ;
+
+/*
+ * unsetenv(name) --
+ *	Delete environmental variable "name".
+ */
+#ifdef __LIBC12_SOURCE__
+void
+#else
+int
+#endif
+unsetenv(name)
+	const char *name;
+{
+	char **p;
+	int offset;
+
+	_DIAGASSERT(name != NULL);
+
+#ifndef __LIBC12_SOURCE__
+	if (name == NULL || *name == '\0' || strchr(name, '=') != NULL) {
+		errno = EINVAL;
+		return (-1);
+	}
+#endif
+
+	rwlock_wrlock(&__environ_lock);
+	while (__findenv(name, &offset))	/* if set multiple times */
+		for (p = &environ[offset];; ++p)
+			if (!(*p = *(p + 1)))
+				break;
+	rwlock_unlock(&__environ_lock);
+
+#ifndef __LIBC12_SOURCE__
+	return (0);
+#endif
+}

lib/libc/stdlib/getenv.3

@@ -1,4 +1,4 @@
-.\"	$NetBSD: getenv.3,v 1.13 2002/08/10 17:14:50 yamt Exp $
+.\"	$NetBSD: getenv.3,v 1.14 2003/04/07 13:41:14 kleink Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -37,7 +37,7 @@
 .\"
 .\"     from: @(#)getenv.3	8.2 (Berkeley) 12/11/93
 .\"
-.Dd August 11, 2002
+.Dd April 1, 2003
 .Dt GETENV 3
 .Os
 .Sh NAME
@@ -70,7 +70,9 @@ and
 may be appended and prepended,
 respectively,
 with an equal sign
-.Dq Li \&= .
+.Dq Li \&= ,
+except for
+.Fn unsetenv .
 .Pp
 The
 .Fn getenv
@@ -116,9 +118,10 @@ deletes all instances of the variable name pointed to by
 from the list.
 .Sh RETURN VALUES
 The functions
-.Fn setenv
-and
+.Fn setenv ,
 .Fn putenv
+and
+.Fn unsetenv
 return zero if successful; otherwise the global variable
 .Va errno
 is set to indicate the error and a
@@ -129,6 +132,15 @@ If
 is successful, the string returned should be considered read-only.
 .Sh ERRORS
 .Bl -tag -width Er
+.It Bq Er EINVAL
+The
+.Fa name
+argument to
+.Fn unsetenv
+is a null pointer, points to an empty string, or points to a string
+containing an
+.Dq Li \&=
+character.
 .It Bq Er ENOMEM
 The function
 .Fn setenv
@@ -150,6 +162,10 @@ The
 .Fn putenv
 function conforms to
 .St -xpg4 .
+The
+.Fn unsetenv
+function conforms to
+.St -p1003.1-2001 .
 .Sh HISTORY
 The functions
 .Fn setenv

lib/libc/stdlib/setenv.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: setenv.c,v 1.21 2003/01/18 11:32:04 thorpej Exp $	*/
+/*	$NetBSD: setenv.c,v 1.22 2003/04/07 13:41:14 kleink Exp $	*/
 
 /*
  * Copyright (c) 1987, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)setenv.c	8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: setenv.c,v 1.21 2003/01/18 11:32:04 thorpej Exp $");
+__RCSID("$NetBSD: setenv.c,v 1.22 2003/04/07 13:41:14 kleink Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -53,7 +53,6 @@ __RCSID("$NetBSD: setenv.c,v 1.21 2003/01/18 11:32:04 thorpej Exp $");
 
 #ifdef __weak_alias
 __weak_alias(setenv,_setenv)
-__weak_alias(unsetenv,_unsetenv)
 #endif
 
 #ifdef _REENTRANT
@@ -135,24 +134,3 @@ setenv(name, value, rewrite)
 	rwlock_unlock(&__environ_lock);
 	return (0);
 }
-
-/*
- * unsetenv(name) --
- *	Delete environmental variable "name".
- */
-void
-unsetenv(name)
-	const char *name;
-{
-	char **p;
-	int offset;
-
-	_DIAGASSERT(name != NULL);
-
-	rwlock_wrlock(&__environ_lock);
-	while (__findenv(name, &offset))	/* if set multiple times */
-		for (p = &environ[offset];; ++p)
-			if (!(*p = *(p + 1)))
-				break;
-	rwlock_unlock(&__environ_lock);
-}

lib/libc/stdlib/unsetenv.c

@@ -0,0 +1,10 @@
+/*	$NetBSD: unsetenv.c,v 1.1 2003/04/07 13:41:14 kleink Exp $	*/
+
+/*
+ * Written by Klaus Klein <kleink@netbsd.org>, April 1, 2003.
+ * Public domain.
+ */
+
+#define __LIBC12_SOURCE__
+
+#include "__unsetenv13.c"