mirror of
https://github.com/python/cpython.git
synced 2025-12-09 10:37:17 +00:00
Use strncpy() instead of sprintf() in calculate_path().
Also reformat calculate_path() using the standard format.
This commit is contained in:
parent
8f6d868bbb
commit
350306953a
1 changed files with 19 additions and 15 deletions
|
|
@ -1,24 +1,28 @@
|
||||||
#include "Python.h"
|
#include "Python.h"
|
||||||
#include "osdefs.h"
|
#include "osdefs.h"
|
||||||
|
|
||||||
static char *prefix,*exec_prefix,*progpath,*module_search_path=0;
|
static char *prefix, *exec_prefix, *progpath, *module_search_path=NULL;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
calculate_path()
|
calculate_path()
|
||||||
{ char *pypath=getenv("Python$Path");
|
{
|
||||||
if(pypath)
|
char *pypath = getenv("Python$Path");
|
||||||
{ module_search_path=malloc(strlen(pypath)+1);
|
if (pypath) {
|
||||||
if (module_search_path) sprintf(module_search_path,"%s",pypath);
|
int pathlen = strlen(pypath);
|
||||||
else
|
module_search_path = malloc(pathlen + 1);
|
||||||
{ /* We can't exit, so print a warning and limp along */
|
if (module_search_path)
|
||||||
fprintf(stderr, "Not enough memory for dynamic PYTHONPATH.\n");
|
strncpy(module_search_path, pypath, pathlen);
|
||||||
fprintf(stderr, "Using default static PYTHONPATH.\n");
|
else {
|
||||||
}
|
fprintf(stderr,
|
||||||
}
|
"Not enough memory for dynamic PYTHONPATH.\n"
|
||||||
if(!module_search_path) module_search_path = "<Python$Dir>.Lib";
|
"Using default static PYTHONPATH.\n");
|
||||||
prefix="<Python$Dir>";
|
}
|
||||||
exec_prefix=prefix;
|
}
|
||||||
progpath=Py_GetProgramName();
|
if (!module_search_path)
|
||||||
|
module_search_path = "<Python$Dir>.Lib";
|
||||||
|
prefix = "<Python$Dir>";
|
||||||
|
exec_prefix = prefix;
|
||||||
|
progpath = Py_GetProgramName();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* External interface */
|
/* External interface */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue