Changeset 946 for trunk/src/binutils/libiberty/pex-os2.c

Timestamp:

Jan 11, 2004, 5:40:14 PM (22 years ago)

Author:

bird

Message:

Copied the working port from old libiberty.

File:

• trunk/src/binutils/libiberty/pex-os2.c (modified) (4 diffs, 1 prop)

trunk/src/binutils/libiberty/pex-os2.c

@@ -22 +22 @@
 #include "pex-common.h"
 
+#include <stdio.h>
+#include <errno.h>
+#ifdef NEED_DECLARATION_ERRNO
+extern int errno;
+#endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -31 +39 @@
 #include <sys/wait.h>
 #endif
+
+#ifndef HAVE_WAITPID
+#define waitpid(pid, status, flags) wait(status)
+#endif
+
 #include <process.h>
+#define INCL_BASE
+#include <os2.h>
 
 int
@@ -42 +57 @@
      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;
+#ifdef __OS2__
+#define pipes_supported 1
+#else
+  int pipes_supported = _osmode != DOS_MODE || (_emx_env & 0x1000);
 
-  if ((flags & PEXECUTE_ONE) != PEXECUTE_ONE)
-    abort ();
-  pid = (flags & PEXECUTE_SEARCH ? spawnvp : spawnv) (P_WAIT, program, argv);
+  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;
+    }
+#endif
+
+  /* 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)
     {
-      *errmsg_fmt = install_error_msg;
-      *errmsg_arg = program;
-      return -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
@@ -64 +139 @@
   /* ??? Here's an opportunity to canonicalize the values in STATUS.
      Needed?  */
-  int pid = wait (status);
-  return pid;
+  int rc;
+  do
+   rc = waitpid (pid, status, flags);
+  while (rc < 0 && errno == EINTR);
+  return rc;
 }
-