Changeset 3080 for trunk

Timestamp:

Apr 9, 2007, 11:14:07 PM (18 years ago)

Author:

bird

Message:

Don't make big assumptions about the whereabouts of sh on OS/2.

File:

• trunk/essentials/sys-apps/gawk/io.c (modified) (3 diffs)

trunk/essentials/sys-apps/gawk/io.c

@@ -1831 +1831 @@
 
                         execl("/bin/sh", "sh", "-c", str, NULL);
+#ifdef __EMX__
+                        execlp("sh.exe", "sh", "-c", str, NULL);
+#endif
                         _exit(errno == ENOENT ? 127 : 126);
 
@@ -1934 +1937 @@
         /* stderr does NOT get dup'ed onto child's stdout */
         pid = spawnl(P_NOWAIT, "/bin/sh", "sh", "-c", str, NULL);
+# if 1 /* yea, like everyone has /bin/sh on OS/2. */
+        if (pid < 0)
+            pid = spawnlp(P_NOWAIT, "sh.exe", "sh", "-c", str, NULL);
+# endif 
         
         /* restore stdin and stdout */
@@ -2105 +2112 @@
         os_close_on_exec(p[0], cmd, "pipe", "from"); /* pipe output: input of the parent process */
         os_close_on_exec(save_stdout, cmd, "pipe", "from"); /* saved stdout of the parent process */
-        
+
         pid = spawnl(P_NOWAIT, "/bin/sh", "sh", "-c", cmd, NULL);
+# if 1 /* yea, like everyone has /bin/sh on OS/2. */
+        if (pid < 0)
+            pid = spawnlp(P_NOWAIT, "sh.exe", "sh", "-c", cmd, NULL);
+# endif
+
         
         /* restore stdout */