Some changes to make it work on NT; add the directory where the binary
lives to the end of the path. (Still to do: add $PYTHONPATH to the front instead of using it as is; add the Win32 registry paths as in getpath_nt.c (which can then retire).)
This commit is contained in:
parent
0e6ae93894
commit
8f1b651980
|
@ -35,6 +35,10 @@ PERFORMANCE OF THIS SOFTWARE.
|
|||
#include "Python.h"
|
||||
#include "osdefs.h"
|
||||
|
||||
#ifdef MS_WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <string.h>
|
||||
|
@ -149,7 +153,6 @@ static void
|
|||
get_progpath()
|
||||
{
|
||||
#ifdef MS_WIN32
|
||||
#include <windows.h>
|
||||
if (!GetModuleFileName(NULL, progpath, MAXPATHLEN))
|
||||
progpath[0] = '\0'; /* failure */
|
||||
#else
|
||||
|
@ -239,6 +242,7 @@ calculate_path()
|
|||
if (*pt == DELIM)
|
||||
bufsz++; /* number of DELIM plus one */
|
||||
bufsz *= strlen(PYTHONPATH) + strlen(prefix); /* high estimate */
|
||||
bufsz += strlen(argv0_path) + 1;
|
||||
|
||||
module_search_path = buf = malloc(bufsz);
|
||||
|
||||
|
@ -259,6 +263,9 @@ calculate_path()
|
|||
else
|
||||
*buf++ = *pt;
|
||||
}
|
||||
*buf++ = DELIM;
|
||||
strcpy(buf, argv0_path);
|
||||
buf += strlen(buf);
|
||||
*buf = '\0';
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue