Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use setenv so that we don't leak memory.

This commit is contained in:
christos 2012-04-22 15:55:41 +00:00
parent 7006e67fd8
commit 37a2b6f0c2
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/libc/compat/stdlib/compat_putenv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: compat_putenv.c,v 1.1 2012/04/20 17:31:30 christos Exp $ */
/* $NetBSD: compat_putenv.c,v 1.2 2012/04/22 15:55:41 christos Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@ -30,17 +30,19 @@
*/
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: compat_putenv.c,v 1.1 2012/04/20 17:31:30 christos Exp $");
__RCSID("$NetBSD: compat_putenv.c,v 1.2 2012/04/22 15:55:41 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#define __LIBC12_SOURCE__
#include "namespace.h"
#include <assert.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <compat/include/stdlib.h>
#include "env.h"
#include "reentrant.h"
#include "local.h"
@ -48,23 +50,35 @@ __RCSID("$NetBSD: compat_putenv.c,v 1.1 2012/04/20 17:31:30 christos Exp $");
__weak_alias(putenv,_putenv)
#endif
__warn_references(unsetenv,
__warn_references(putenv,
"warning: reference to compatibility putenv();"
" include <stdlib.h> for correct reference")
/*
* putenv(name) --
* This version copies the string for compatibility.
* This version implicitly copies the string for compatibility.
*/
int
putenv(char *name)
{
size_t l_name;
char *copy;
int rv;
_DIAGASSERT(name != NULL);
l_name = __envvarnamelen(name, true);
if (l_name == 0) {
errno = EINVAL;
return -1;
}
if ((copy = strdup(name)) == NULL)
return -1;
copy[l_name++] = '\0';
return __putenv50(copy);
rv = setenv(copy, copy + l_name, 1);
free(copy);
return rv;
}