Changeset 3451

Timestamp:

Jun 16, 2007, 3:42:59 PM (18 years ago)

Author:

bird

Message:

LIBPATHSTRICT, use opendir and not DosFindFirst, and removed a three warnings.

File:

• trunk/essentials/dev-lang/python/Modules/posixmodule.c (modified) (8 diffs)

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

@@ -406 +406 @@
             Py_DECREF(v);
         }
+#ifdef LIBPATHSTRICT
+        buffer[0] = buffer[1] = buffer[2] = buffer[3] = '\0';
+        rc = DosQueryExtLIBPATH(buffer, LIBPATHSTRICT);
+        if (rc == NO_ERROR) { /* (not a typo, envname is NOT 'LIBPATH_STRICT') */
+            PyObject *v = PyString_FromString(buffer);
+                    PyDict_SetItemString(d, "LIBPATHSTRICT", v);
+            Py_DECREF(v);
+        }
+#endif
     }
 #endif
@@ -1950 +1959 @@
         return d;
 
-#elif defined(PYOS_OS2)
+#elif defined(PYOS_OS2) && !defined(__KLIBC__)
 
 #ifndef MAX_PATH
@@ -2800 +2809 @@
 #if defined(PYOS_OS2)
         /* Omit Pseudo-Env Vars that Would Confuse Programs if Passed On */
-        if (stricmp(k, "BEGINLIBPATH") != 0 && stricmp(k, "ENDLIBPATH") != 0) {
+        if (stricmp(k, "BEGINLIBPATH") != 0 && stricmp(k, "ENDLIBPATH") != 0
+         && stricmp(k, "LIBPATHSTRICT") != 0) {
 #endif
                 len = PyString_Size(key) + PyString_Size(val) + 2;
@@ -4021 +4031 @@
         struct pipe_ref p_fd[3];
         FILE *p_s[3];
-        int file_count, i, pipe_err, pipe_pid;
+        int file_count, i, pipe_err, pipe_pid = -1;
         char *shell, *sh_name, *opt, *rd_mode, *wr_mode;
         PyObject *f, *p_f[3];
@@ -6116 +6126 @@
 posix_pipe(PyObject *self, PyObject *noargs)
 {
-#if defined(PYOS_OS2)
+#if defined(PYOS_OS2) && !defined(__KLIBC__)
     HFILE read, write;
     APIRET rc;
@@ -6322 +6332 @@
         if (rc != NO_ERROR)
             return os2_error(rc);
+#ifdef LIBPATHSTRICT
+    } else if (stricmp(s1, "LIBPATHSTRICT") == 0) {
+        APIRET rc;
+
+        rc = DosSetExtLIBPATH(s2, LIBPATHSTRICT);
+        if (rc != NO_ERROR)
+            return os2_error(rc);
+#endif
     } else {
-#endif
+#endif /* OS2 */
 
         /* XXX This can leak memory -- not easy to fix :-( */
@@ -8267 +8285 @@
     APIRET    rc;
     ULONG     values[QSV_MAX+1];
-    PyObject *v;
     char     *ver, tmp[50];
 
@@ -8296 +8313 @@
     default:
         PyOS_snprintf(tmp, sizeof(tmp),
-                      "%d-%d", values[QSV_VERSION_MAJOR],
+                      "%ld-%ld", values[QSV_VERSION_MAJOR],
                       values[QSV_VERSION_MINOR]);
         ver = &tmp[0];