#if defined (HAVE_SETENV)
return ::setenv(name.c_str(), encoded.c_str(), 1) == 0;
#elif defined (HAVE_PUTENV)
+ // According to http://pubs.opengroup.org/onlinepubs/9699919799/functions/putenv.html
+ // the argument of putenv() needs to be static, because changing its
+ // value will change the environment. Therefore we need a different static
+ // storage for each variable.
+ // FIXME THREAD
static map<string, string> varmap;
varmap[name] = name + '=' + encoded;
return ::putenv(const_cast<char*>(varmap[name].c_str())) == 0;
{
#if defined(HAVE_UNSETENV)
// FIXME: does it leak?
- return unsetenv(name.c_str()) == 0;
+ return ::unsetenv(name.c_str()) == 0;
#elif defined(HAVE_PUTENV)
// This is OK with MSVC and MinGW at least.
- return putenv((name + "=").c_str()) == 0;
+ // The argument of putenv() does not need to be a static variable in this
+ // case, since the variable is removed from the environment.
+ return ::putenv(const_cast<char*>((name + "=").c_str())) == 0;
#else
#error No environment-unsetting function has been defined.
#endif