bpo-45434: Convert Py_GETENV() macro to a function (pythonGH-28912)

vstinner · web-flow · commit 489176e42853 · 2021-10-13T03:39:50.000+02:00
Avoid calling directly getenv() in the header file.
diff --git a/Include/cpython/pydebug.h b/Include/cpython/pydebug.h
@@ -29,7 +29,7 @@ PyAPI_DATA(int) Py_LegacyWindowsStdioFlag;
 /* this is a wrapper around getenv() that pays attention to
    Py_IgnoreEnvironmentFlag.  It should be used for getting variables like
    PYTHONPATH and PYTHONHOME from the environment */
-#define Py_GETENV(s) (Py_IgnoreEnvironmentFlag ? NULL : getenv(s))
+PyAPI_DATA(char*) Py_GETENV(const char *name);
 
 #ifdef __cplusplus
 }
diff --git a/Python/initconfig.c b/Python/initconfig.c
@@ -249,6 +249,14 @@ _Py_GetGlobalVariablesAsDict(void)
 #undef SET_ITEM_STR
 }
 
+char*
+Py_GETENV(const char *name)
+{
+    if (Py_IgnoreEnvironmentFlag) {
+        return NULL;
+    }
+    return getenv(name);
+}
 
 /* --- PyStatus ----------------------------------------------- */
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ PyAPI_DATA(int) Py_LegacyWindowsStdioFlag;`
`29`	`29`	`/* this is a wrapper around getenv() that pays attention to`
`30`	`30`	`Py_IgnoreEnvironmentFlag. It should be used for getting variables like`
`31`	`31`	`PYTHONPATH and PYTHONHOME from the environment */`
`32`		`-#define Py_GETENV(s) (Py_IgnoreEnvironmentFlag ? NULL : getenv(s))`
	`32`	`+PyAPI_DATA(char) Py_GETENV(const char name);`
`33`	`33`
`34`	`34`	`#ifdef __cplusplus`
`35`	`35`	`}`