Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Make delimiter and separator static for K&R C.

This commit is contained in:
Guido van Rossum 1997-05-20 22:38:21 +00:00
parent f9cba090f9
commit 7929c6fe95
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/getpath.c
View File

@ -152,6 +152,7 @@ PERFORMANCE OF THIS SOFTWARE.
static char prefix[MAXPATHLEN+1]; static char prefix[MAXPATHLEN+1];
static char exec_prefix[MAXPATHLEN+1]; static char exec_prefix[MAXPATHLEN+1];
static char progpath[MAXPATHLEN+1];
static char *module_search_path = NULL; static char *module_search_path = NULL;
static char lib_python[20]; /* Dynamically set to "lib/python" VERSION */ static char lib_python[20]; /* Dynamically set to "lib/python" VERSION */
@ -324,15 +325,14 @@ calculate_path()
{ {
extern char *Py_GetProgramName(); extern char *Py_GetProgramName();
char delimiter[2] = {DELIM, '\0'}; static char delimiter[2] = {DELIM, '\0'};
char separator[2] = {SEP, '\0'}; static char separator[2] = {SEP, '\0'};
char *pythonpath = PYTHONPATH; char *pythonpath = PYTHONPATH;
char *rtpypath = getenv("PYTHONPATH"); char *rtpypath = getenv("PYTHONPATH");
char *home = getenv("PYTHONHOME"); char *home = getenv("PYTHONHOME");
char *path = getenv("PATH"); char *path = getenv("PATH");
char *prog = Py_GetProgramName(); char *prog = Py_GetProgramName();
char argv0_path[MAXPATHLEN+1]; char argv0_path[MAXPATHLEN+1];
char progpath[MAXPATHLEN+1];
int pfound, efound; /* 1 if found; -1 if found build directory */ int pfound, efound; /* 1 if found; -1 if found build directory */
char *buf; char *buf;
int bufsz; int bufsz;
@ -543,3 +543,11 @@ Py_GetExecPrefix()
calculate_path(); calculate_path();
return exec_prefix; return exec_prefix;
} }
char *
Py_GetProgramFullPath()
{
if (!module_search_path)
calculate_path();
return progpath;
}