[Python-checkins] CVS: python/dist/src/RISCOS/Modules getpath_riscos.c,1.3,1.4

2001年11月28日 13:30:06 -0800

Update of /cvsroot/python/python/dist/src/RISCOS/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv25184
Modified Files:
	getpath_riscos.c 
Log Message:
Use strncpy() instead of sprintf() in calculate_path().
Also reformat calculate_path() using the standard format.
Index: getpath_riscos.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/RISCOS/Modules/getpath_riscos.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** getpath_riscos.c	2001年10月24日 20:12:29	1.3
--- getpath_riscos.c	2001年11月28日 21:30:04	1.4
***************
*** 2,23 ****
 #include "osdefs.h"

! static char *prefix,*exec_prefix,*progpath,*module_search_path=0;

 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();
 }

--- 2,27 ----
 #include "osdefs.h"

! static char *prefix, *exec_prefix, *progpath, *module_search_path=NULL;

 static void
 calculate_path()
! { 
! 	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();
 }