* Added Fixcprt.py: script to fix copyright message.

* various modules: added 1993 to copyright.
* thread.c: added copyright notice.
* ceval.c: minor change to error message for "+"
* stdwinmodule.c: check for error from wfetchcolor
* config.c: MS-DOS fixes (define PYTHONPATH, use DELIM, use osdefs.h)
* Add declaration of inittab to import.h
* sysmodule.c: added sys.builtin_module_names
* xxmodule.c, xxobject.c: fix minor errors

9 files changed, 51 insertions, 21 deletions

diff --git a/Modules/audioop.c b/Modules/audioop.c
index c938eea..301b494 100644
--- a/Modules/audioop.c
+++ b/Modules/audioop.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
-Netherlands.
+Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
+Amsterdam, The Netherlands.
 
                         All Rights Reserved
 
diff --git a/Modules/config.c.in b/Modules/config.c.in
index 11e2cdd..549d14f 100644
--- a/Modules/config.c.in
+++ b/Modules/config.c.in
@@ -28,7 +28,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define USE_MARSHAL	1	/* This is linked anyway */
 #define USE_MATH	1
 #define USE_STRUCT	1
-#define USE_STROP	1
 #define USE_TIME	1
 
 #ifdef macintosh
@@ -36,8 +35,8 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define USE_IMAGEOP	1
 #define USE_MAC		1
 #define USE_REGEX	1
-#define USE_ROTOR	1
 #define USE_STDWIN	1	/* You may turn this off */
+#define USE_STROP
 #endif
 
 #ifdef unix
@@ -48,10 +47,18 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define USE_SOCKET	1
 #endif
 
+#ifdef MSDOS
+#define USE_POSIX	1	/* Subset defined in posixmodule.c */
+#define USE_REGEX	1
+#define USE_STROP	1
+#define USE_PC		1
+#endif
+
 #include <stdio.h>
 
 #include "PROTO.h"
 #include "mymalloc.h"
+#include "osdefs.h"
 
 #include "patchlevel.h"
 
@@ -116,12 +123,25 @@ donecalls()
 }
 
 #ifndef PYTHONPATH
+
 #ifdef macintosh
 /* On the Mac, the search path is a space-separated list of directories */
 #define PYTHONPATH ": :lib :demo"
-#else /* !macintosh */
+#endif /* macintosh */
+
+#ifdef unix
 #define PYTHONPATH ".:/usr/local/lib/python"
-#endif /* !macintosh */
+#endif /* unix */
+
+#ifdef MSDOS
+/* In MS-DOS, the delimiter is a semicolon */
+#define PYTHONPATH ".;C\\python\\lib"
+#endif /* MSDOS */
+
+#ifndef PYTHONPATH
+ERROR; ERROR; On what kind of system are you?;
+#endif
+
 #endif /* !PYTHONPATH */
 
 extern char *getenv();
@@ -135,6 +155,7 @@ getpythonpath()
 	char *path = getenv("PYTHONPATH");
 	char *defpath = PYTHONPATH;
 	char *buf;
+	char *p;
 	int n;
 
 	if (path == 0 || *path == '\0')
@@ -144,8 +165,9 @@ getpythonpath()
 	if (buf == NULL)
 		return path; /* XXX too bad -- but not likely */
 	strcpy(buf, path);
-	strcat(buf, ":");
-	strcat(buf, defpath);
+	p = buf + strlen(buf);
+	*p++ = DELIM;
+	strcpy(p, defpath);
 	return buf;
 #endif /* !macintosh */
 }
diff --git a/Modules/imageop.c b/Modules/imageop.c
index 9c0107b..49301b7 100644
--- a/Modules/imageop.c
+++ b/Modules/imageop.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
-Netherlands.
+Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
+Amsterdam, The Netherlands.
 
                         All Rights Reserved
 
diff --git a/Modules/imgfile.c b/Modules/imgfile.c
index 075fc46..7783083 100644
--- a/Modules/imgfile.c
+++ b/Modules/imgfile.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
-Netherlands.
+Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
+Amsterdam, The Netherlands.
 
                         All Rights Reserved
 
diff --git a/Modules/rotormodule.c b/Modules/rotormodule.c
index f16acd0..4e9afd8 100644
--- a/Modules/rotormodule.c
+++ b/Modules/rotormodule.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
-Netherlands.
+Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
+Amsterdam, The Netherlands.
 
                         All Rights Reserved
 
diff --git a/Modules/stdwinmodule.c b/Modules/stdwinmodule.c
index 62e9b47..77ba6ec 100644
--- a/Modules/stdwinmodule.c
+++ b/Modules/stdwinmodule.c
@@ -2119,9 +2119,17 @@ stdwin_fetchcolor(self, args)
 	object *args;
 {
 	char *colorname;
+	COLOR color;
 	if (!getstrarg(args, &colorname))
 		return NULL;
-	return newintobject((long)wfetchcolor(colorname));
+	color = wfetchcolor(colorname);
+#ifdef BADCOLOR
+	if (color == BADCOLOR) {
+		err_setstr(StdwinError, "color name not found");
+		return NULL;
+	}
+#endif
+	return newintobject((long)color);
 }
 
 static object *
diff --git a/Modules/svmodule.c b/Modules/svmodule.c
index 6df8b95..0d14473 100644
--- a/Modules/svmodule.c
+++ b/Modules/svmodule.c
@@ -1,6 +1,6 @@
 /**********************************************************
-Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
-Netherlands.
+Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
+Amsterdam, The Netherlands.
 
                         All Rights Reserved
 
diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
index 123c4d3..7a5f29d 100644
--- a/Modules/threadmodule.c
+++ b/Modules/threadmodule.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
-Netherlands.
+Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
+Amsterdam, The Netherlands.
 
                         All Rights Reserved
 
diff --git a/Modules/xxmodule.c b/Modules/xxmodule.c
index 070a622..cf6481e 100644
--- a/Modules/xxmodule.c
+++ b/Modules/xxmodule.c
@@ -1,6 +1,6 @@
 /***********************************************************
-Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
-Netherlands.
+Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
+Amsterdam, The Netherlands.
 
                         All Rights Reserved