+2008-09-24 Pawel Veselov <pawel.veselov@gmail.com>
+
+ Fix setenv/getenv/unsetenv to be OpenGroup compliant:
+ * libc/include/stdlib.h (unsetenv, _unsetenv_r): Redefine with integer
+ return types.
+ * libc/stdlib/getenv_r.c (_findenv_r): Do no special processing with
+ names that contain equal chars.
+ * libc/stdlib/setenv.c: Redefine _unsetenv_r as returning int.
+ * libc/stdlib/setenv_r.c (_setenv_r): Return -1 and set errno to
+ EINVAL if name contains an equal sign. Do not remove any equal signs
+ from the value.
+ (_unsetenv_r): Modified to return int. Return -1 and set EINVAL
+ if name contains equal sign. Return -1 if no variable(s) were found
+ and return 0 otherwise.
+
2008-09-19 Eric Blake <ebb9@byu.net>
Supply missing POSIX errno values.
#ifndef __CYGWIN__
_VOID _EXFUN(cfree,(_PTR));
-void _EXFUN(unsetenv,(const char *__string));
-void _EXFUN(_unsetenv_r,(struct _reent *, const char *__string));
+int _EXFUN(unsetenv,(const char *__string));
+int _EXFUN(_unsetenv_r,(struct _reent *, const char *__string));
#endif
#endif /* ! __STRICT_ANSI__ */
* Returns pointer to value associated with name, if any, else NULL.
* Sets offset to be the offset of the name/value combination in the
* environmental array, for use by setenv(3) and unsetenv(3).
- * Explicitly removes '=' in argument name.
*
* This routine *should* be a static; don't use it.
*/
return NULL;
}
- c = name;
- len = 0;
- while (*c && *c != '=')
- {
- c++;
- len++;
- }
+ len = strlen(name);
+ c = name + len;
for (p = *p_environ; *p; ++p)
if (!strncmp (*p, name, len))
#include <stdlib.h>
#include <string.h>
-extern void _unsetenv_r _PARAMS ((struct _reent *, const char *));
+extern int _unsetenv_r _PARAMS ((struct _reent *, const char *));
/*
* setenv --
* unsetenv(name) --
* Delete environmental variable "name".
*/
-void
+int
_DEFUN (unsetenv, (name),
_CONST char *name)
{
- _unsetenv_r (_REENT, name);
+ return _unsetenv_r (_REENT, name);
}
#endif /* !_REENT_ONLY */
#include <stdlib.h>
#include <string.h>
#include <time.h>
+#include <errno.h>
#include "envlock.h"
extern char **environ;
* _setenv_r --
* Set the value of the environmental variable "name" to be
* "value". If rewrite is set, replace any current value.
+ * If "name" contains equal sign, -1 is returned, and errno is
+ * set to EINVAL;
*/
int
register char *C;
int l_value, offset;
+ if (strchr(name, '='))
+ {
+ errno = EINVAL;
+ return -1;
+ }
+
ENV_LOCK;
- if (*value == '=') /* no `=' in value */
- ++value;
l_value = strlen (value);
if ((C = _findenv_r (reent_ptr, name, &offset)))
{ /* find if already exists */
* _unsetenv_r(name) --
* Delete environmental variable "name".
*/
-void
+int
_DEFUN (_unsetenv_r, (reent_ptr, name),
struct _reent *reent_ptr _AND
_CONST char *name)
{
register char **P;
int offset;
+ int rc;
+
+ if (strchr(name, '='))
+ {
+ errno = EINVAL;
+ return -1;
+ }
ENV_LOCK;
+ rc = -1;
+
while (_findenv_r (reent_ptr, name, &offset)) /* if set multiple times */
- for (P = &(*p_environ)[offset];; ++P)
- if (!(*P = *(P + 1)))
- break;
+ {
+ rc = 0;
+ for (P = &(*p_environ)[offset];; ++P)
+ if (!(*P = *(P + 1)))
+ break;
+ }
ENV_UNLOCK;
+ return (rc);
}