Changeset 3435

Timestamp:

Jun 16, 2007, 1:59:14 AM (18 years ago)

Author:

bird

Message:

Some popen hacks.

File:

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

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

@@ -3851 +3851 @@
         char *mode = "r";
         int bufsize = -1;
+        int unset_emxshell = 0;
         FILE *fp;
         PyObject *f;
         if (!PyArg_ParseTuple(args, "s|si:popen", &name, &mode, &bufsize))
                 return NULL;
+        /* a little hack for making sure commands.getstatusoutput works 
+         * (ASSUMES that COMSPEC isn't a posix shell.) */
+        if (name[0] == '{' && !getenv("EMXSHELL")) {
+                char path[512];
+                _searchenv("sh.exe", "PATH", path);
+                if (!path[0])
+                        _searchenv("ash.exe", "PATH", path);
+                if (!path[0])
+                        _searchenv("bash.exe", "PATH", path);
+                if (path[0])
+                        unset_emxshell = setenv("EMXSHELL", path, 0) == 0;
+        }
         Py_BEGIN_ALLOW_THREADS
         fp = popen(name, mode);
         Py_END_ALLOW_THREADS
+        if (unset_emxshell)
+                unsetenv("EMXSHELL");
         if (fp == NULL)
                 return posix_error();
@@ -4025 +4040 @@
         if ((shell = getenv("EMXSHELL")) == NULL)
                 if ((shell = getenv("COMSPEC")) == NULL)
-                {
-                        errno = ENOENT;
-                        return posix_error();
-                }
+                        if ((shell = getenv("SHELL")) == NULL)
+                                if ((shell = getenv("OS2_SHELL")) == NULL)
+                                {
+                                        errno = ENOENT;
+                                        return posix_error();
+                                }
 
         sh_name = _getname(shell);