mirror of
https://github.com/python/cpython.git
synced 2025-10-17 20:28:43 +00:00
bpo-32030: Add Python/pathconfig.c (#4668)
* Factorize code from PC/getpathp.c and Modules/getpath.c to remove duplicated code * rename pathconfig_clear() to _PyPathConfig_Clear() * Inline _PyPathConfig_Fini() in pymain_impl() and then remove it, since it's a oneliner
This commit is contained in:
parent
ebac19dad6
commit
0ea395ae96
10 changed files with 204 additions and 291 deletions
|
@ -1489,61 +1489,6 @@ Py_EndInterpreter(PyThreadState *tstate)
|
|||
PyInterpreterState_Delete(interp);
|
||||
}
|
||||
|
||||
#ifdef MS_WINDOWS
|
||||
static wchar_t *progname = L"python";
|
||||
#else
|
||||
static wchar_t *progname = L"python3";
|
||||
#endif
|
||||
|
||||
void
|
||||
Py_SetProgramName(wchar_t *pn)
|
||||
{
|
||||
if (pn && *pn)
|
||||
progname = pn;
|
||||
}
|
||||
|
||||
wchar_t *
|
||||
Py_GetProgramName(void)
|
||||
{
|
||||
return progname;
|
||||
}
|
||||
|
||||
static wchar_t *default_home = NULL;
|
||||
|
||||
void
|
||||
Py_SetPythonHome(wchar_t *home)
|
||||
{
|
||||
default_home = home;
|
||||
}
|
||||
|
||||
|
||||
wchar_t*
|
||||
Py_GetPythonHome(void)
|
||||
{
|
||||
/* Use a static buffer to avoid heap memory allocation failure.
|
||||
Py_GetPythonHome() doesn't allow to report error, and the caller
|
||||
doesn't release memory. */
|
||||
static wchar_t buffer[MAXPATHLEN+1];
|
||||
|
||||
if (default_home) {
|
||||
return default_home;
|
||||
}
|
||||
|
||||
char *home = Py_GETENV("PYTHONHOME");
|
||||
if (!home) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
size_t size = Py_ARRAY_LENGTH(buffer);
|
||||
size_t r = mbstowcs(buffer, home, size);
|
||||
if (r == (size_t)-1 || r >= size) {
|
||||
/* conversion failed or the static buffer is too small */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return buffer;
|
||||
}
|
||||
|
||||
/* Add the __main__ module */
|
||||
|
||||
static _PyInitError
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue