bpo-39406: Implement os.putenv() with setenv() if available (GH-18128)
If setenv() C function is available, os.putenv() is now implemented
with setenv() instead of putenv(), so Python doesn't have to handle
the environment variable memory.
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index aa4756a..13a69cd 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -6034,7 +6034,7 @@
#endif /* (defined(HAVE_POSIX_FADVISE) && !defined(POSIX_FADVISE_AIX_BUG)) */
-#if defined(HAVE_PUTENV) && defined(MS_WINDOWS)
+#if defined(MS_WINDOWS)
PyDoc_STRVAR(os_putenv__doc__,
"putenv($module, name, value, /)\n"
@@ -6080,9 +6080,9 @@
return return_value;
}
-#endif /* defined(HAVE_PUTENV) && defined(MS_WINDOWS) */
+#endif /* defined(MS_WINDOWS) */
-#if defined(HAVE_PUTENV) && !defined(MS_WINDOWS)
+#if ((defined(HAVE_SETENV) || defined(HAVE_PUTENV)) && !defined(MS_WINDOWS))
PyDoc_STRVAR(os_putenv__doc__,
"putenv($module, name, value, /)\n"
@@ -6123,7 +6123,7 @@
return return_value;
}
-#endif /* defined(HAVE_PUTENV) && !defined(MS_WINDOWS) */
+#endif /* ((defined(HAVE_SETENV) || defined(HAVE_PUTENV)) && !defined(MS_WINDOWS)) */
#if defined(HAVE_UNSETENV)
@@ -8773,4 +8773,4 @@
#ifndef OS__REMOVE_DLL_DIRECTORY_METHODDEF
#define OS__REMOVE_DLL_DIRECTORY_METHODDEF
#endif /* !defined(OS__REMOVE_DLL_DIRECTORY_METHODDEF) */
-/*[clinic end generated code: output=51ba5b9536420cea input=a9049054013a1b77]*/
+/*[clinic end generated code: output=6f42d8be634f5942 input=a9049054013a1b77]*/
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 71b99fd..6a68752 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -819,19 +819,20 @@
}
}
-/* Windows: _wputenv(env) copies the *env* string and doesn't require the
- caller to manage the variable memory. */
-#if defined(HAVE_PUTENV) && !defined(MS_WINDOWS)
+/* Windows _wputenv() and setenv() copy the arguments and so don't require
+ the caller to manage the variable memory. Only Unix putenv() requires
+ putenv_dict. */
+#if defined(HAVE_PUTENV) && !defined(MS_WINDOWS) && !defined(HAVE_SETENV)
# define PY_PUTENV_DICT
#endif
typedef struct {
PyObject *billion;
#ifdef PY_PUTENV_DICT
- /* putenv() and _wputenv() requires that the caller manages the environment
- variable memory. Use a Python dictionary for that: name => env, where
- env is a string like "name=value". On Windows, dict keys and values are
- Unicode strings. On Unix, they are bytes strings. */
+ /* putenv() requires that the caller manages the environment variable
+ memory. Use a Python dictionary for that: name => env, where env is a
+ string like "name=value". On Windows, dict keys and values are Unicode
+ strings. On Unix, they are bytes strings. */
PyObject *putenv_dict;
#endif
PyObject *DirEntryType;
@@ -10081,8 +10082,6 @@
#endif /* PY_PUTENV_DICT */
-#ifdef HAVE_PUTENV
-
#ifdef MS_WINDOWS
/*[clinic input]
os.putenv
@@ -10132,8 +10131,6 @@
posix_error();
goto error;
}
- /* _wputenv(env) copies the *env* string and doesn't require the caller
- to manage the variable memory. */
Py_DECREF(unicode);
Py_RETURN_NONE;
@@ -10142,7 +10139,8 @@
Py_DECREF(unicode);
return NULL;
}
-#else /* MS_WINDOWS */
+/* repeat !defined(MS_WINDOWS) to workaround an Argument Clinic issue */
+#elif (defined(HAVE_SETENV) || defined(HAVE_PUTENV)) && !defined(MS_WINDOWS)
/*[clinic input]
os.putenv
@@ -10157,8 +10155,6 @@
os_putenv_impl(PyObject *module, PyObject *name, PyObject *value)
/*[clinic end generated code: output=d29a567d6b2327d2 input=a97bc6152f688d31]*/
{
- PyObject *bytes = NULL;
- char *env;
const char *name_string = PyBytes_AS_STRING(name);
const char *value_string = PyBytes_AS_STRING(value);
@@ -10166,22 +10162,28 @@
PyErr_SetString(PyExc_ValueError, "illegal environment variable name");
return NULL;
}
- bytes = PyBytes_FromFormat("%s=%s", name_string, value_string);
+
+#ifdef HAVE_SETENV
+ if (setenv(name_string, value_string, 1)) {
+ return posix_error();
+ }
+#else
+ PyObject *bytes = PyBytes_FromFormat("%s=%s", name_string, value_string);
if (bytes == NULL) {
return NULL;
}
- env = PyBytes_AS_STRING(bytes);
+ char *env = PyBytes_AS_STRING(bytes);
if (putenv(env)) {
Py_DECREF(bytes);
return posix_error();
}
posix_putenv_dict_setitem(name, bytes);
+#endif
Py_RETURN_NONE;
}
-#endif /* MS_WINDOWS */
-#endif /* HAVE_PUTENV */
+#endif /* defined(HAVE_SETENV) || defined(HAVE_PUTENV) */
#ifdef HAVE_UNSETENV