Reimplement addbuilddir() in C inside getpath.c, so as to execute it
at interpreter startup before importing any non-builtin modules.
Should fix #9589.
diff --git a/Modules/main.c b/Modules/main.c
index 7929b05..d605bab 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -101,10 +101,10 @@
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 @@
return NULL;
}
return fopen(cpath, cmode);
-}
+#else
+ return _wfopen(path, mode);
#endif
+}
static int
@@ -640,7 +642,7 @@
}
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)