Changeset 3364 for trunk/essentials/dev-lang

Timestamp:

May 21, 2007, 2:27:53 AM (19 years ago)

Author:

bird

Message:

In progress...

Location:

trunk/essentials/dev-lang/python

Files:

• Include/osdefs.h (modified) (2 diffs)
• Lib/tempfile.py (modified) (1 diff)
• Makefile.pre.in (modified) (1 diff)
• Modules/getpath.c (modified) (10 diffs)
• Modules/posixmodule.c (modified) (1 diff)
• Objects/exceptions.c (modified) (1 diff)
• PC/os2emx/Setup.os2emx (copied) (copied from trunk/essentials/dev-lang/python/Modules/Setup.dist ) (1 diff)
• Python/dynload_shlib.c (modified) (5 diffs)
• Python/import.c (modified) (2 diffs)
• Python/sysmodule.c (modified) (3 diffs)
• Python/traceback.c (modified) (2 diffs)
• configure.in (modified) (8 diffs)

trunk/essentials/dev-lang/python/Include/osdefs.h

@@ -20 +20 @@
 #define MAXPATHLEN 256
 #endif
+
 #define DELIM ';'
 #endif
@@ -34 +35 @@
 #ifndef SEP
 #define SEP '/'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #endif
 

trunk/essentials/dev-lang/python/Lib/tempfile.py

@@ -437 +437 @@
     return _TemporaryFileWrapper(file, name)
 
-if _os.name != 'posix' or _os.sys.platform == 'cygwin':
+if _os.name != 'posix' or _os.sys.platform == 'cygwin':
     # On non-POSIX and Cygwin systems, assume that we cannot unlink a file
     # while it is open.

trunk/essentials/dev-lang/python/Makefile.pre.in

@@ -484 +484 @@
 
 $(AST_H): $(AST_ASDL) $(ASDLGEN_FILES)
+
         $(ASDLGEN) -h $(AST_H_DIR) $(AST_ASDL)
+
 
 $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
+
         $(ASDLGEN) -c $(AST_C_DIR) $(AST_ASDL)
+
 
 Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H)

trunk/essentials/dev-lang/python/Modules/getpath.c

@@ -136 +136 @@
 {
     size_t i = strlen(dir);
-    while (i > 0 && dir[i] != SEP)
+    while (i > 0 && )
         --i;
     dir[i] = '\0';
@@ -209 +209 @@
 {
     size_t n, k;
-    if (stuff[0] == SEP)
+    if ()
         n = 0;
     else {
         n = strlen(buffer);
-        if (n > 0 && buffer[n-1] != SEP && n < MAXPATHLEN)
+        if (n > 0 &&  && n < MAXPATHLEN)
             buffer[n++] = SEP;
     }
@@ -230 +230 @@
 copy_absolute(char *path, char *p)
 {
-    if (p[0] == SEP)
+    if (
         strcpy(path, p);
+
+
+
+
+
+
     else {
         getcwd(path, MAXPATHLEN);
-        if (p[0] == '.' && p[1] == SEP)
+        if (p[0] == '.' && )
             p += 2;
         joinpath(path, p);
@@ -246 +252 @@
     char buffer[MAXPATHLEN + 1];
 
-    if (path[0] == SEP)
+    if (IS_ABSPATH(path)) {
+#ifdef ALTSEP
+        while ((path = strchr(path, ALTSEP)))
+            *path++ = SEP;
+#endif
         return;
+
     copy_absolute(buffer, path);
     strcpy(path, buffer);
@@ -399 +410 @@
          * $PATH isn't exported, you lose.
          */
-        if (strchr(prog, SEP))
+        if ())
                 strncpy(progpath, prog, MAXPATHLEN);
 #ifdef __APPLE__
@@ -442 +453 @@
         else
                 progpath[0] = '\0';
-        if (progpath[0] != SEP)
+#ifndef ALTSEP
+        if (!IS_ABSPATH(progpath))
+#endif
                 absolutize(progpath);
         strncpy(argv0_path, progpath, MAXPATHLEN);
@@ -488 +501 @@
             /* It's not null terminated! */
             tmpbuffer[linklen] = '\0';
-            if (tmpbuffer[0] == SEP)
+            if ()
                 /* tmpbuffer should never be longer than MAXPATHLEN,
                    but extra check does not hurt */
@@ -553 +566 @@
 
     while (1) {
-        char *delim = strchr(defpath, DELIM);
-
-        if (defpath[0] != SEP)
+        char *delim = strchr(defpath, 
+
+        if ()
             /* Paths are relative to prefix */
             bufsz += prefixsz;
@@ -598 +611 @@
         defpath = pythonpath;
         while (1) {
-            char *delim = strchr(defpath, DELIM);
-
-            if (defpath[0] != SEP) {
+            char *delim = strchr(defpath, 
+
+            if () {
                 strcat(buf, prefix);
                 strcat(buf, separator);
@@ -606 +619 @@
 
             if (delim) {
-                size_t len = delim - defpath + 1;
+                size_t len = delim - defpath;
                 size_t end = strlen(buf) + len;
                 strncat(buf, defpath, len);
-                *(buf + end) = '\0';
+                *(buf + end) = DELIM;   /* bird: correct the DELIM char. */
+                *(buf + end + 1) = '\0';
             }
             else {

trunk/essentials/dev-lang/python/Modules/posixmodule.c

@@ -132 +132 @@
 #define fsync _commit
 #else
-#if defined(PYOS_OS2) && defined(PYCC_GCC) || defined(__VMS)
+#if ) || defined(__VMS)
 /* Everything needed is defined in PC/os2emx/pyconfig.h or vms/pyconfig.h */
 #else                   /* all other compilers */

trunk/essentials/dev-lang/python/Objects/exceptions.c

@@ -1052 +1052 @@
         return "???";
     while (*cp != '\0') {
-        if (*cp == SEP)
+        if ()
             result = cp + 1;
         ++cp;

trunk/essentials/dev-lang/python/PC/os2emx/Setup.os2emx

@@ -110 +110 @@
 # setup.py script in the root of the Python source tree.
 
-posix posixmodule.c             # posix (UNIX) system calls
+ posix (UNIX) system calls
 errno errnomodule.c             # posix (UNIX) errno values
 pwd pwdmodule.c                 # this is needed to find out the user's home dir

trunk/essentials/dev-lang/python/Python/dynload_shlib.c

@@ -21 +21 @@
 #else
 #if defined(PYOS_OS2) && defined(PYCC_GCC)
+
+
+
 #include "dlfcn.h"
 #endif
 #endif
 
-#if (defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__)
+#if ((defined(__OpenBSD__) || defined(__NetBSD__)) && !defined(__ELF__)) \
+    || (defined(__OS2__) && defined(__KLIBC__))
 #define LEAD_UNDERSCORE "_"
 #else
@@ -37 +41 @@
         {"module.dll", "rb", C_EXTENSION},
 #else
-#if defined(PYOS_OS2) && defined(PYCC_GCC)
+#if )
         {".pyd", "rb", C_EXTENSION},
         {".dll", "rb", C_EXTENSION},
@@ -82 +86 @@
         }
 
-        PyOS_snprintf(funcname, sizeof(funcname), 
+        PyOS_snprintf(funcname, sizeof(funcname),
                       LEAD_UNDERSCORE "init%.200s", shortname);
 
@@ -114 +118 @@
 
         if (Py_VerboseFlag)
-                PySys_WriteStderr("dlopen(\"%s\", %x);\n", pathname, 
+                PySys_WriteStderr("dlopen(\"%s\", %x);\n", pathname,
                                   dlopenflags);
 
@@ -123 +127 @@
         /* As C module use only one name space this is probably not a */
         /* important limitation */
-        PyOS_snprintf(pathbuf, sizeof(pathbuf), "python_module_%-.200s", 
+        PyOS_snprintf(pathbuf, sizeof(pathbuf), "python_module_%-.200s",
                       shortname);
         pathname = pathbuf;

trunk/essentials/dev-lang/python/Python/import.c

@@ -1475 +1475 @@
 #include <dirent.h>
 
+
+
+
 #elif defined(PYOS_OS2)
 #define INCL_DOS
@@ -1594 +1597 @@
 
 /* OS/2 */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #elif defined(PYOS_OS2)
         HDIR hdir = 1;

trunk/essentials/dev-lang/python/Python/sysmodule.c

@@ -1319 +1319 @@
                         /* It's a symlink */
                         link[nr] = '\0';
-                        if (link[0] == SEP)
+                        if ()
                                 argv0 = link; /* Link to absolute path */
-                        else if (strchr(link, SEP) == NULL)
+                        else if ()
                                 ; /* Link without path */
                         else {
                                 /* Must join(dirname(argv0), link) */
                                 char *q = strrchr(argv0, SEP);
+
+
+
+
+
+
+
+
+
+
                                 if (q == NULL)
                                         argv0 = link; /* argv0 without path */
@@ -1331 +1341 @@
                                         /* Must make a copy */
                                         strcpy(argv0copy, argv0);
-                                        q = strrchr(argv0copy, SEP);
+;
                                         strcpy(q+1, link);
                                         argv0 = argv0copy;
@@ -1369 +1379 @@
 #endif
                         p = strrchr(argv0, SEP);
+
+
+
+
+
+
+
+
+
+
+
                 }
                 if (p != NULL) {

trunk/essentials/dev-lang/python/Python/traceback.c

@@ -140 +140 @@
                 PyObject *path;
                 char *tail = strrchr(filename, SEP);
+
+
+
+
+
+
+
+
+
                 if (tail == NULL)
                         tail = filename;
@@ -164 +173 @@
                                         if (strlen(namebuf) != len)
                                                 continue; /* v contains '\0' */
-                                        if (len > 0 && namebuf[len-1] != SEP)
+                                        if (len > 0 && )
                                                 namebuf[len++] = SEP;
                                         strcpy(namebuf+len, tail);

trunk/essentials/dev-lang/python/configure.in

@@ -184 +184 @@
         atheos*) MACHDEP="atheos";;
         irix646) MACHDEP="irix6";;
+
+
         '')     MACHDEP="unknown";;
         esac
@@ -487 +489 @@
     gcc) CC="$CC -D_HAVE_BSDI";;
     esac;;
+
+
+
 esac
 
@@ -519 +524 @@
 # LDLIBRARYDIR is the path to LDLIBRARY, which is made in a subdirectory. On
 # systems without shared libraries, LDLIBRARY is the same as LIBRARY
-# (defined in the Makefiles). On Cygwin LDLIBRARY is the import library,
-# DLLLIBRARY is the shared (i.e., DLL) library.
-# 
+# (defined in the Makefiles). On Cygwin 
+# DLLLIBRARY is the shared (i.e., DLL) library.
+#
 # RUNSHARED is used to run shared python without installed libraries
 #
@@ -665 +670 @@
           RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
           ;;
+
+
+
+
+
+
+
   esac
 else # shared is disabled
@@ -706 +718 @@
                 BeOS*) LN="ln -s";;
                 CYGWIN*) LN="ln -s";;
+
                 atheos*) LN="ln -s";;
                 *) LN=ln;;
@@ -1396 +1409 @@
 AC_SUBST(LINKFORSHARED)
 # SO is the extension of shared libraries `(including the dot!)
-# -- usually .so, .sl on HP-UX, .dll on Cygwin
+# -- usually .so, .sl on HP-UX, .dll on Cygwin
 AC_MSG_CHECKING(SO)
 if test -z "$SO"
@@ -1408 +1421 @@
                 ;;
         CYGWIN*)   SO=.dll;;
+
         *)         SO=.so;;
         esac
@@ -3402 +3416 @@
 if test ! -f Modules/Setup
 then
-        cp $srcdir/Modules/Setup.dist Modules/Setup
+        if test "$MACHDEP" = "emx"; then
+        cp $srcdir/PC/os2emx/Modules/Setup.os2emx Modules/Setup
+    else
+        cp $srcdir/Modules/Setup.dist Modules/Setup
+    if
 fi