grand renaming; added copyright to some files

2 files changed, 35 insertions, 20 deletions

diff --git a/Modules/getpath.c b/Modules/getpath.c
index 4e356ed..4f49cc3 100644
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -1,26 +1,46 @@
+/***********************************************************
+Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
+The Netherlands.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the names of Stichting Mathematisch
+Centrum or CWI not be used in advertising or publicity pertaining to
+distribution of the software without specific, written prior permission.
+
+STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+******************************************************************/
+
+/* Return the initial module search path. */
+
 #include "Python.h"
 #include "osdefs.h"
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#else
-extern char *getenv Py_PROTO((const char *));
-#endif
-
 
 #ifndef PYTHONPATH
 #define PYTHONPATH ".:/usr/local/lib/python"
 #endif
 
 
-/* Return the initial python search path.  This is called once from
-   initsys() to initialize sys.path.  The environment variable
-   PYTHONPATH is fetched and the default path appended.  The default
-   path may be passed to the preprocessor; if not, a system-dependent
-   default is used. */
+/* This is called once from pythonrun to initialize sys.path.  The
+   environment variable PYTHONPATH is fetched and the default path
+   appended.  The default path may be passed to the preprocessor; if
+   not, a hardcoded default is used, which only makes (some) sense on
+   Unix. */
 
 char *
-getpythonpath()
+Py_GetPath()
 {
 	char *path = getenv("PYTHONPATH");
 	char *defpath = PYTHONPATH;
diff --git a/Modules/main.c b/Modules/main.c
index 4763a59..e123976 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -33,14 +33,9 @@ extern char *optarg;
 extern int getopt(); /* PROTO((int, char **, char *)); -- not standardized */
 
 
-extern int Py_DebugFlag; /* For parser.c, declared in pythonrun.c */
-extern int Py_VerboseFlag; /* For import.c, declared in pythonrun.c */
-extern int Py_SuppressPrintingFlag; /* For ceval.c, declared in pythonrun.c */
-
-
 /* Subroutines that live in their own file */
-extern char *getversion();
-extern char *getcopyright();
+extern char *Py_GetVersion();
+extern char *Py_GetCopyright();
 
 
 /* For getprogramname(); set by main() */
@@ -174,7 +169,7 @@ main(argc, argv)
 	if (Py_VerboseFlag ||
 	    command == NULL && filename == NULL && isatty((int)fileno(fp)))
 		fprintf(stderr, "Python %s\n%s\n",
-			getversion(), getcopyright());
+			Py_GetVersion(), Py_GetCopyright());
 	
 	if (filename != NULL) {
 		if ((fp = fopen(filename, "r")) == NULL) {