languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-04 16:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some changes to make it work on NT; add the directory where the binary

Browse source 
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:
Guido van Rossum 1997-08-13 19:55:43 +00:00
parent 0e6ae93894
commit 8f1b651980
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
PC/getpathp.c
View file

@ -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);
@ -251,7 +255,7 @@ calculate_path()
}
for (pt = PYTHONPATH; *pt; pt++) {
if (!strncmp(pt, ".\\lib", 5) &&
((ch = *(pt + 5)) == '\\' || ch == DELIM || !ch)){
((ch = *(pt + 5)) == '\\' || ch == DELIM || !ch)) {
pt += 4;
for (pt2 = prefix; *pt2; pt2++)
*buf++ = *pt2;
@ -259,6 +263,9 @@ calculate_path()
else
*buf++ = *pt;
}
*buf++ = DELIM;
strcpy(buf, argv0_path);
buf += strlen(buf);
*buf = '\0';
}