mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-14 18:59:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Reimplement addbuilddir() in C inside getpath.c, so as to execute it

Browse source 
at interpreter startup before importing any non-builtin modules.
Should fix #9589.
This commit is contained in:
Antoine Pitrou 2010-08-13 22:25:01 +00:00
parent 09c449c7de
commit e9b428f997
8 changed files with 53 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/main.c
View file

@ -101,10 +101,10 @@ PYTHONCASEOK : ignore case in 'import' statements (Windows).\n\
PYTHONIOENCODING: Encoding[:errors] used for stdin/stdout/stderr.\n\
";
#ifndef MS_WINDOWS
static FILE*
_wfopen(const wchar_t *path, const wchar_t *mode)
FILE *
_Py_wfopen(const wchar_t *path, const wchar_t *mode)
{
#ifndef MS_WINDOWS
char cpath[PATH_MAX];
char cmode[10];
size_t r;
@ -119,8 +119,10 @@ _wfopen(const wchar_t *path, const wchar_t *mode)
return NULL;
}
return fopen(cpath, cmode);
}
#else
return _wfopen(path, mode);
#endif
}
static int
@ -640,7 +642,7 @@ Py_Main(int argc, wchar_t **argv)
}
if (sts==-1 && filename!=NULL) {
if ((fp = _wfopen(filename, L"r")) == NULL) {
if ((fp = _Py_wfopen(filename, L"r")) == NULL) {
char cfilename[PATH_MAX];
size_t r = wcstombs(cfilename, filename, PATH_MAX);
if (r == PATH_MAX)