summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Hylton <jeremy@alum.mit.edu>2001-11-28 21:30:04 (GMT)
committerJeremy Hylton <jeremy@alum.mit.edu>2001-11-28 21:30:04 (GMT)
commit350306953ace94b6326d63edd1dd5ebb915c9630 (patch)
tree83753f126470df56c7c57f86cd8f2e5d2e7c4054
parent8f6d868bbb6d503765d9be5cc08e359fedb53fe9 (diff)
downloadcpython-350306953ace94b6326d63edd1dd5ebb915c9630.zip
cpython-350306953ace94b6326d63edd1dd5ebb915c9630.tar.gz
cpython-350306953ace94b6326d63edd1dd5ebb915c9630.tar.bz2
Use strncpy() instead of sprintf() in calculate_path().
Also reformat calculate_path() using the standard format.
-rw-r--r--RISCOS/Modules/getpath_riscos.c34
1 files changed, 19 insertions, 15 deletions
diff --git a/RISCOS/Modules/getpath_riscos.c b/RISCOS/Modules/getpath_riscos.c
index 8705e2c..5ac8b72 100644
--- a/RISCOS/Modules/getpath_riscos.c
+++ b/RISCOS/Modules/getpath_riscos.c
@@ -1,24 +1,28 @@
#include "Python.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
calculate_path()
-{ char *pypath=getenv("Python$Path");
- if(pypath)
- { module_search_path=malloc(strlen(pypath)+1);
- if (module_search_path) sprintf(module_search_path,"%s",pypath);
- else
- { /* We can't exit, so print a warning and limp along */
- fprintf(stderr, "Not enough memory for dynamic PYTHONPATH.\n");
- fprintf(stderr, "Using default static PYTHONPATH.\n");
- }
- }
- if(!module_search_path) module_search_path = "<Python$Dir>.Lib";
- prefix="<Python$Dir>";
- exec_prefix=prefix;
- progpath=Py_GetProgramName();
+{
+ char *pypath = getenv("Python$Path");
+ if (pypath) {
+ int pathlen = strlen(pypath);
+ module_search_path = malloc(pathlen + 1);
+ if (module_search_path)
+ strncpy(module_search_path, pypath, pathlen);
+ else {
+ fprintf(stderr,
+ "Not enough memory for dynamic PYTHONPATH.\n"
+ "Using default static PYTHONPATH.\n");
+ }
+ }
+ if (!module_search_path)
+ module_search_path = "<Python$Dir>.Lib";
+ prefix = "<Python$Dir>";
+ exec_prefix = prefix;
+ progpath = Py_GetProgramName();
}
/* External interface */