Commit 35030695 authored by Jeremy Hylton's avatar Jeremy Hylton

Use strncpy() instead of sprintf() in calculate_path().

Also reformat calculate_path() using the standard format.
parent 8f6d868b
#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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment