mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#5924: on Windows, a large PYTHONPATH (more than 255 chars) was completely ignored.

Browse source 
Will backport to 3.0.
This commit is contained in:
Amaury Forgeot d'Arc 2009-06-09 21:30:01 +00:00
parent 5b4a54c5d5
commit 66f8c43b09
3 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
PC/getpathp.c
View file

@ -424,8 +424,6 @@ calculate_path(void)
wchar_t *buf;
size_t bufsz;
wchar_t *pythonhome = Py_GetPythonHome();
char *_envpath = Py_GETENV("PYTHONPATH");
wchar_t wenvpath[MAXPATHLEN+1];
wchar_t *envpath = NULL;
#ifdef MS_WINDOWS
@ -434,13 +432,20 @@ calculate_path(void)
wchar_t *userpath = NULL;
wchar_t zip_path[MAXPATHLEN+1];
size_t len;
#endif
if (!Py_IgnoreEnvironmentFlag) {
envpath = _wgetenv(L"PYTHONPATH");
}
#else
char *_envpath = Py_GETENV("PYTHONPATH");
wchar_t wenvpath[MAXPATHLEN+1];
if (_envpath) {
size_t r = mbstowcs(wenvpath, _envpath, MAXPATHLEN+1);
envpath = wenvpath;
if (r == (size_t)-1 || r >= MAXPATHLEN)
envpath = NULL;
}
#endif
get_progpath();
/* progpath guaranteed \0 terminated in MAXPATH+1 bytes. */