[Python-checkins] CVS: python/dist/src/Modules _hotshot.c,1.14,1.15 dbmmodule.c,2.28,2.29 fcntlmodule.c,2.33,2.34 main.c,1.63,1.64 pwdmodule.c,1.27,1.28 readline.c,2.43,2.44 selectmodule.c,2.60,2.61 signalmodule.c,2.62,2.63 termios.c,2.33,2.34 timemodule.c,2.122,2.123 unicodedata.c,2.14,2.15
Andrew I MacIntyre
aimacintyre@users.sourceforge.net
Sat, 02 Mar 2002 18:59:18 -0800
Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv430
Modified Files:
_hotshot.c dbmmodule.c fcntlmodule.c main.c pwdmodule.c
readline.c selectmodule.c signalmodule.c termios.c
timemodule.c unicodedata.c
Log Message:
OS/2 EMX port changes (Modules part of patch #450267):
Modules/
_hotshot.c
dbmmodule.c
fcntlmodule.c
main.c
pwdmodule.c
readline.c
selectmodule.c
signalmodule.c
termios.c
timemodule.c
unicodedata.c
Index: _hotshot.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/_hotshot.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** _hotshot.c 12 Feb 2002 04:02:33 -0000 1.14
--- _hotshot.c 3 Mar 2002 02:59:15 -0000 1.15
***************
*** 27,31 ****
#error "This module requires gettimeofday() on non-Windows platforms!"
#endif
! #ifdef macintosh
#include <sys/time.h>
#else
--- 27,31 ----
#error "This module requires gettimeofday() on non-Windows platforms!"
#endif
! #if defined(macintosh) || (defined(PYOS_OS2) && defined(PYCC_GCC))
#include <sys/time.h>
#else
***************
*** 52,55 ****
--- 52,59 ----
#endif
+ #if defined(PYOS_OS2) && defined(PYCC_GCC)
+ #define PATH_MAX 260
+ #endif
+
#ifndef PATH_MAX
# ifdef MAX_PATH
***************
*** 988,992 ****
#endif
}
! #if defined(MS_WIN32) || defined(macintosh)
rusage_diff = -1;
#else
--- 992,996 ----
#endif
}
! #if defined(MS_WIN32) || defined(macintosh) || defined(PYOS_OS2)
rusage_diff = -1;
#else
Index: dbmmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/dbmmodule.c,v
retrieving revision 2.28
retrieving revision 2.29
diff -C2 -d -r2.28 -r2.29
*** dbmmodule.c 8 Dec 2001 18:02:56 -0000 2.28
--- dbmmodule.c 3 Mar 2002 02:59:15 -0000 2.29
***************
*** 14,18 ****
--- 14,22 ----
#if defined(HAVE_NDBM_H)
#include <ndbm.h>
+ #if defined(PYOS_OS2) && !defined(PYCC_GCC)
static char *which_dbm = "ndbm";
+ #else
+ static char *which_dbm = "GNU gdbm"; /* EMX port of GDBM */
+ #endif
#elif defined(HAVE_DB1_NDBM_H)
#include <db1/ndbm.h>
Index: fcntlmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/fcntlmodule.c,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -d -r2.33 -r2.34
*** fcntlmodule.c 12 Jan 2002 11:05:06 -0000 2.33
--- fcntlmodule.c 3 Mar 2002 02:59:15 -0000 2.34
***************
*** 223,226 ****
--- 223,231 ----
return NULL;
+ #if defined(PYOS_OS2) && defined(PYCC_GCC)
+ PyErr_SetString(PyExc_NotImplementedError,
+ "lockf not supported on OS/2 (EMX)");
+ return NULL;
+ #else
#ifndef LOCK_SH
#define LOCK_SH 1 /* shared lock */
***************
*** 228,232 ****
#define LOCK_NB 4 /* don't block when locking */
#define LOCK_UN 8 /* unlock */
! #endif
{
struct flock l;
--- 233,237 ----
#define LOCK_NB 4 /* don't block when locking */
#define LOCK_UN 8 /* unlock */
! #endif /* LOCK_SH */
{
struct flock l;
***************
*** 276,279 ****
--- 281,285 ----
Py_INCREF(Py_None);
return Py_None;
+ #endif /* defined(PYOS_OS2) && defined(PYCC_GCC) */
}
Index: main.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/main.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** main.c 11 Feb 2002 18:46:47 -0000 1.63
--- main.c 3 Mar 2002 02:59:16 -0000 1.64
***************
*** 9,16 ****
#endif
! #if defined(PYOS_OS2) || defined(MS_WINDOWS)
#define PYTHONHOMEHELP "<prefix>\\lib"
#else
#define PYTHONHOMEHELP "<prefix>/pythonX.X"
#endif
--- 9,20 ----
#endif
! #if (defined(PYOS_OS2) && !defined(PYCC_GCC)) || defined(MS_WINDOWS)
#define PYTHONHOMEHELP "<prefix>\\lib"
#else
+ #if defined(PYOS_OS2) && defined(PYCC_GCC)
+ #define PYTHONHOMEHELP "<prefix>/Lib"
+ #else
#define PYTHONHOMEHELP "<prefix>/pythonX.X"
+ #endif
#endif
Index: pwdmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/pwdmodule.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** pwdmodule.c 1 Mar 2002 10:38:44 -0000 1.27
--- pwdmodule.c 3 Mar 2002 02:59:16 -0000 1.28
***************
*** 129,134 ****
--- 129,138 ----
if ((d = PyList_New(0)) == NULL)
return NULL;
+ #if defined(PYOS_OS2) && defined(PYCC_GCC)
+ if ((p = getpwuid(0)) != NULL) {
+ #else
setpwent();
while ((p = getpwent()) != NULL) {
+ #endif
PyObject *v = mkpwent(p);
if (v == NULL || PyList_Append(d, v) != 0) {
Index: readline.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/readline.c,v
retrieving revision 2.43
retrieving revision 2.44
diff -C2 -d -r2.43 -r2.44
*** readline.c 13 Feb 2002 11:58:25 -0000 2.43
--- readline.c 3 Mar 2002 02:59:16 -0000 2.44
***************
*** 508,511 ****
--- 508,515 ----
{
rl_readline_name = "python";
+ #if defined(PYOS_OS2) && defined(PYCC_GCC)
+ /* Allow $if term= in .inputrc to work */
+ rl_terminal_name = getenv("TERM");
+ #endif
/* Force rebind of TAB to insert-tab */
rl_bind_key('\t', rl_insert);
Index: selectmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/selectmodule.c,v
retrieving revision 2.60
retrieving revision 2.61
diff -C2 -d -r2.60 -r2.61
*** selectmodule.c 12 Jan 2002 11:05:08 -0000 2.60
--- selectmodule.c 3 Mar 2002 02:59:16 -0000 2.61
***************
*** 34,38 ****
#endif
! #if defined(PYOS_OS2)
#include <sys/time.h>
#include <utils.h>
--- 34,38 ----
#endif
! #if defined(PYOS_OS2) && !defined(PYCC_GCC)
#include <sys/time.h>
#include <utils.h>
Index: signalmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/signalmodule.c,v
retrieving revision 2.62
retrieving revision 2.63
diff -C2 -d -r2.62 -r2.63
*** signalmodule.c 12 Jan 2002 11:43:25 -0000 2.62
--- signalmodule.c 3 Mar 2002 02:59:16 -0000 2.63
***************
*** 17,21 ****
#endif
! #if defined(PYOS_OS2)
#define NSIG 12
#include <process.h>
--- 17,21 ----
#endif
! #if defined(PYOS_OS2) && !defined(PYCC_GCC)
#define NSIG 12
#include <process.h>
Index: termios.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/termios.c,v
retrieving revision 2.33
retrieving revision 2.34
diff -C2 -d -r2.33 -r2.34
*** termios.c 14 Feb 2002 07:08:31 -0000 2.33
--- termios.c 3 Mar 2002 02:59:16 -0000 2.34
***************
*** 385,389 ****
--- 385,391 ----
{"OLCUC", OLCUC},
#endif
+ #ifdef ONLCR
{"ONLCR", ONLCR},
+ #endif
#ifdef OCRNL
{"OCRNL", OCRNL},
***************
*** 553,557 ****
--- 555,561 ----
{"VLNEXT", VLNEXT},
#endif
+ #ifdef VEOL2
{"VEOL2", VEOL2},
+ #endif
Index: timemodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/timemodule.c,v
retrieving revision 2.122
retrieving revision 2.123
diff -C2 -d -r2.122 -r2.123
*** timemodule.c 13 Feb 2002 05:14:18 -0000 2.122
--- timemodule.c 3 Mar 2002 02:59:16 -0000 2.123
***************
*** 55,58 ****
--- 55,64 ----
#endif /* MS_WIN32 && !MS_WIN64 */
+ #if defined(PYOS_OS2)
+ #define INCL_DOS
+ #define INCL_ERRORS
+ #include <os2.h>
+ #endif
+
#if defined(PYCC_VACPP)
#include <sys/time.h>
***************
*** 753,757 ****
{
/* XXX Should test for MS_WIN32 first! */
! #if defined(HAVE_SELECT) && !defined(__BEOS__)
struct timeval t;
double frac;
--- 759,763 ----
{
/* XXX Should test for MS_WIN32 first! */
! #if defined(HAVE_SELECT) && !defined(__BEOS__) && !defined(__EMX__)
struct timeval t;
double frac;
Index: unicodedata.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/unicodedata.c,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -d -r2.14 -r2.15
*** unicodedata.c 30 Nov 2001 07:23:05 -0000 2.14
--- unicodedata.c 3 Mar 2002 02:59:16 -0000 2.15
***************
*** 278,282 ****
static int
! _getname(Py_UCS4 code, char* buffer, int buflen)
{
int offset;
--- 278,282 ----
static int
! _Py_getname(Py_UCS4 code, char* buffer, int buflen)
{
int offset;
***************
*** 335,339 ****
int i;
char buffer[NAME_MAXLEN];
! if (!_getname(code, buffer, sizeof(buffer)))
return 0;
for (i = 0; i < namelen; i++) {
--- 335,339 ----
int i;
char buffer[NAME_MAXLEN];
! if (!_Py_getname(code, buffer, sizeof(buffer)))
return 0;
for (i = 0; i < namelen; i++) {
***************
*** 385,389 ****
{
sizeof(_PyUnicode_Name_CAPI),
! _getname,
_getcode
};
--- 385,389 ----
{
sizeof(_PyUnicode_Name_CAPI),
! _Py_getname,
_getcode
};
***************
*** 408,412 ****
}
! if (!_getname((Py_UCS4) *PyUnicode_AS_UNICODE(v),
name, sizeof(name))) {
if (defobj == NULL) {
--- 408,412 ----
}
! if (!_Py_getname((Py_UCS4) *PyUnicode_AS_UNICODE(v),
name, sizeof(name))) {
if (defobj == NULL) {