grand renaming; added copyright to some files

diff --git a/Modules/getpath.c b/Modules/getpath.c
index 4e356ed8168a92dfd62832e429655df041521582..4f49cc3a1f78c77c0d2723a9fbe877d382d5fa41 100644 (file)
--- 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 4763a595f5260b9124cec20f321a885f378ee6e9..e123976a098e90d2ed00d31b5013a12cc1a9ab56 100644 (file)
--- 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) {

diff --git a/Python/frozen.c b/Python/frozen.c
index 5c1d3b4b2d92cacaaec62a0fa950886c4c8d342d..633931485c8f155563b77e917884663b803b1788 100644 (file)
--- a/Python/frozen.c
+++ b/Python/frozen.c
@@ -1,3 +1,31 @@
+/***********************************************************
+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.
+
+******************************************************************/
+
+/* Dummy frozen modules initializer */
+
+#include "Python.h"
+
 /* In order to test the support for frozen modules, by default we
    define a single frozen module, __hello__.  Loading it will print
    some famous words... */
@@ -15,7 +43,7 @@ struct frozen {
        char *name;
        unsigned char *code;
        int size;
-} frozen_modules[] = {
+} _PyImport_FrozenModules[] = {
        {"__hello__", M___hello__, 81},
        {0, 0, 0} /* sentinel */
 };

diff --git a/Python/frozenmain.c b/Python/frozenmain.c
index 15e61448a727b8940c3947e6a5009550e7460240..17979b3eadbded26099aefcc1b6727ffac182ffe 100644 (file)
--- a/Python/frozenmain.c
+++ b/Python/frozenmain.c
@@ -26,13 +26,9 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "Python.h"
 
-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() */
 static char *argv0;
@@ -69,7 +65,7 @@ main(argc, argv)
 
        if (Py_VerboseFlag)
                fprintf(stderr, "Python %s\n%s\n",
-                       getversion(), getcopyright());
+                       Py_GetVersion(), Py_GetCopyright());
        Py_Initialize();
        PySys_SetArgv(argc, argv);
 

diff --git a/Python/getcompiler.c b/Python/getcompiler.c
index 08167179580e44454400a2c27385673870ce32d5..56ff4867b9ca759c6b8cc4435d3e5e022a27570c 100644 (file)
--- a/Python/getcompiler.c
+++ b/Python/getcompiler.c
@@ -22,26 +22,30 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* Return the compiler identification, if possible. */
+
+#include "Python.h"
 
 #ifndef COMPILER
+
 #ifdef __GNUC__
 #define COMPILER " [GCC " __VERSION__ "]"
 #endif
+
 #endif /* !COMPILER */
 
 #ifndef COMPILER
+
 #ifdef __cplusplus
 #define COMPILER "[C++]"
 #else
 #define COMPILER "[C]"
 #endif
+
 #endif /* !COMPILER */
 
 char *
-getcompiler()
+Py_GetCompiler()
 {
        return COMPILER;
 }

diff --git a/Python/getcopyright.c b/Python/getcopyright.c
index 575004311e463ff14fcd9d92ff021dbf052e938c..5ed7787a3c9163f4a94fe06dfb2df470c3146bda 100644 (file)
--- a/Python/getcopyright.c
+++ b/Python/getcopyright.c
@@ -1,9 +1,33 @@
+/***********************************************************
+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 copyright string.  This is updated manually. */
 
 #include "Python.h"
 
 const char *
-getcopyright()
+Py_GetCopyright()
 {
        return "Copyright 1991-1995 Stichting Mathematisch Centrum, Amsterdam";
 }

diff --git a/Python/getplatform.c b/Python/getplatform.c
index 01e683588f8ecce3ae16eceb9096da8c3ca65dfe..7142fd6a2e38a826df326cb3101724dfaf5f156d 100644 (file)
--- a/Python/getplatform.c
+++ b/Python/getplatform.c
@@ -1,9 +1,35 @@
+/***********************************************************
+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.
+
+******************************************************************/
+
+#include "Python.h"
+
 #ifndef PLATFORM
 #define PLATFORM "unknown"
 #endif
 
 char *
-getplatform()
+Py_GetPlatform()
 {
        return PLATFORM;
 }

diff --git a/Python/getversion.c b/Python/getversion.c
index caf5aaa0888231a66f8bafc454e6122858aefd62..efc7849e43b4f30210d510d46dc3e1e17f8c1420 100644 (file)
--- a/Python/getversion.c
+++ b/Python/getversion.c
@@ -1,3 +1,27 @@
+/***********************************************************
+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 full version string. */
 
 #include "Python.h"
@@ -12,12 +36,12 @@
 #define DATE "October 13 1995"
 #endif
 
-extern const char *getcompiler();
+extern const char *Py_GetCompiler();
 
 const char *
-getversion()
+Py_GetVersion()
 {
        static char version[80];
-       sprintf(version, VERSION, PATCHLEVEL, DATE, getcompiler());
+       sprintf(version, VERSION, PATCHLEVEL, DATE, Py_GetCompiler());
        return version;
 }