Changeset 9 for trunk/src/gcc/libiberty/pexecute.c

Timestamp:

Apr 16, 2003, 4:03:38 PM (22 years ago)

Author:

bird

Message:

Applied initial diff from Platon.

File:

• trunk/src/gcc/libiberty/pexecute.c (modified) (4 diffs, 1 prop)

trunk/src/gcc/libiberty/pexecute.c

@@ -82 +82 @@
 (??? It's not clear that GCC passes this flag correctly).  (@code{@var{flags} &
 PEXECUTE_FIRST}) is nonzero for the first process in chain.
-(@code{@var{flags} & PEXECUTE_FIRST}) is nonzero for the last process
+(@code{@var{flags} & PEXECUTE_LAST}) is nonzero for the last process
 in chain.  The first/last flags could be simplified to only mark the
 last of a chain of processes but that requires the caller to always
@@ -484 +484 @@
 #ifdef OS2
 
-/* ??? Does OS2 have process.h?  */
+/* This is for non-EMX OS/2 port (is it floating around anyway?) */
 extern int spawnv ();
 extern int spawnvp ();
@@ -663 +663 @@
 /* include for Unix-like environments but not for Dos-like environments */
 #if ! defined (__MSDOS__) && ! defined (OS2) && ! defined (MPW) \
-    && ! (defined (_WIN32) && ! defined (_UWIN))
+    && ! (defined (_WIN32) && ! defined (_UWIN)) && ! defined (__EMX__)
 
 extern int execv ();
@@ -790 +790 @@
 }
 
-#endif /* ! __MSDOS__ && ! OS2 && ! MPW && ! (_WIN32 && ! _UWIN) */
+#endif /* ! __MSDOS__ && ! OS2 && ! MPW && ! (_WIN32 && ! _UWIN) && ! && ! __EMX__ */
+
+#ifdef __EMX__
+
+#undef abort
+#include <process.h>
+#include <stdlib.h>
+#define INCL_DOSPROCESS
+#include <os2.h>
+
+int
+pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags)
+     const char *program;
+     char * const *argv;
+     const char *this_pname;
+     const char *temp_base;
+     char **errmsg_fmt, **errmsg_arg;
+     int flags;
+{
+  static int last_pipe_input = STDIN_FILE_NO;
+  int pid;
+  int pdes[2], org_stdin, org_stdout;
+  int input_desc = last_pipe_input;
+  int output_desc = STDOUT_FILE_NO;
+  int pipes_supported = _osmode != DOS_MODE || (_emx_env & 0x1000);
+
+  /* Since the function can reside in a DLL, we should take care
+     environ to not be NULL. Unfortunately this involves os2.h :-( - A.Z. */
+  if (!environ)
+    {
+      PTIB tib;
+      PPIB pib;
+      if (!DosGetInfoBlocks (&tib, &pib))
+      {
+        int count = 1;
+        char *env = pib->pib_pchenv;
+        char **cur;
+        while (*env++)
+          if (!*env)
+            count++, env++;
+        cur = environ = malloc (sizeof (char *) * count);
+        env = pib->pib_pchenv;
+        *cur++ = env;
+        while (*env++)
+          if (!*env)
+            env++, *cur++ = env;
+        cur [-1] = NULL;
+      }
+    }
+
+  if (!pipes_supported && (flags & PEXECUTE_ONE) != PEXECUTE_ONE)
+    {
+      static char *errtpl = "%s: exec %s (pipes not supported)";
+      *errmsg_fmt = (char *) xmalloc (strlen(errtpl) + \
+                     strlen(this_pname) + strlen(program));
+      sprintf (*errmsg_fmt, errtpl, this_pname, program);
+      *errmsg_arg = NULL;
+      return -1;
+    }
+  /* If this isn't the last process, make a pipe for its output,
+     and record it as waiting to be the input to the next process.  */
+  if (!(flags & PEXECUTE_LAST))
+    {
+      if (pipe (pdes) < 0)
+        {
+          static char *errtpl = "%s: pipe to/from %s";
+          *errmsg_fmt = (char *) xmalloc (strlen(errtpl) + \
+                         strlen(this_pname) + strlen(program));
+          sprintf (*errmsg_fmt, errtpl, this_pname, program);
+          *errmsg_arg = NULL;
+          return -1;
+        }
+      output_desc = pdes[WRITE_PORT];
+      last_pipe_input = pdes[READ_PORT];
+    }
+  else
+    last_pipe_input = STDIN_FILE_NO;
+  if (pipes_supported && input_desc != STDIN_FILE_NO)
+    {
+      org_stdin = dup (STDIN_FILE_NO);
+      dup2 (input_desc, STDIN_FILE_NO);
+      close (input_desc);
+    }
+  if (pipes_supported && output_desc != STDOUT_FILE_NO)
+    {
+      org_stdout = dup (STDOUT_FILE_NO);
+      dup2 (output_desc, STDOUT_FILE_NO);
+      close (output_desc);
+    }
+  pid = (flags & PEXECUTE_SEARCH ? spawnvp : spawnv) (P_NOWAIT, program, argv);
+  if (pipes_supported && input_desc != STDIN_FILE_NO)
+    {
+      dup2 (org_stdin, STDIN_FILE_NO);
+      close (org_stdin);
+    }
+  if (pipes_supported && output_desc != STDOUT_FILE_NO)
+    {
+      dup2 (org_stdout, STDOUT_FILE_NO);
+      close (org_stdout);
+    }
+  if (pid == -1)
+    {
+      static char *errtpl = "%s: error executing %s";
+      *errmsg_fmt = (char *) xmalloc (strlen(errtpl) + \
+                     strlen(this_pname) + strlen(program));
+      sprintf (*errmsg_fmt, errtpl, this_pname, program);
+      *errmsg_arg = NULL;
+    }
+  return pid;
+}
+
+int
+pwait (pid, status, flags)
+     int pid;
+     int *status;
+     int flags;
+{
+  int rc;
+  do
+   rc = waitpid (pid, status, flags);
+  while (rc < 0 && errno == EINTR);
+  return rc;
+}
+
+#endif /* __EMX__ */