aboutsummaryrefslogtreecommitdiff
path: root/libiberty/pexecute.c
diff options
context:
space:
mode:
authorJeff Law <law@redhat.com>2000-07-27 01:49:21 +0000
committerJeff Law <law@redhat.com>2000-07-27 01:49:21 +0000
commita9f34fb65256ba2a8fd363f31397aee1f4a208c9 (patch)
treeef43eaa0c7702c5338814555ec68483b94d2b604 /libiberty/pexecute.c
parent6e8008398d2a0f767f9cecc72f4d93e508d9faf8 (diff)
downloadgdb-a9f34fb65256ba2a8fd363f31397aee1f4a208c9.zip
gdb-a9f34fb65256ba2a8fd363f31397aee1f4a208c9.tar.gz
gdb-a9f34fb65256ba2a8fd363f31397aee1f4a208c9.tar.bz2
* pexecute.c (pexecute) [__MSDOS__]: Change __GO32__ to
__DJGPP__. Use P_WAIT instead of constant in the spawnv* call. Cast program to 'char *' in errmsg_arg assignment. (PWAIT_ERROR): Define. (pwait): Use PWAIT_ERROR. Adjust DJGPP's status code to conform to DJGPP's WIF* macros.
Diffstat (limited to 'libiberty/pexecute.c')
-rw-r--r--libiberty/pexecute.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/libiberty/pexecute.c b/libiberty/pexecute.c
index 4a1970d..9c62b57 100644
--- a/libiberty/pexecute.c
+++ b/libiberty/pexecute.c
@@ -157,9 +157,9 @@ pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags)
if ((flags & PEXECUTE_ONE) != PEXECUTE_ONE)
abort ();
-#ifdef __GO32__
+#ifdef __DJGPP__
/* ??? What are the possible return values from spawnv? */
- rc = (flags & PEXECUTE_SEARCH ? spawnvp : spawnv) (1, program, argv);
+ rc = (flags & PEXECUTE_SEARCH ? spawnvp : spawnv) (P_WAIT, program, argv);
#else
char *scmd, *rf;
FILE *argfile;
@@ -208,7 +208,7 @@ pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags)
if (rc == -1)
{
*errmsg_fmt = install_error_msg;
- *errmsg_arg = program;
+ *errmsg_arg = (char *)program;
return -1;
}
@@ -217,6 +217,13 @@ pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags)
return last_pid;
}
+/* Use ECHILD if available, otherwise use EINVAL. */
+#ifdef ECHILD
+#define PWAIT_ERROR ECHILD
+#else
+#define PWAIT_ERROR EINVAL
+#endif
+
int
pwait (pid, status, flags)
int pid;
@@ -228,13 +235,16 @@ pwait (pid, status, flags)
/* Called twice for the same child? */
|| pid == last_reaped)
{
- /* ??? ECHILD would be a better choice. Can we use it here? */
- errno = EINVAL;
+ errno = PWAIT_ERROR;
return -1;
}
/* ??? Here's an opportunity to canonicalize the values in STATUS.
Needed? */
+#ifdef __DJGPP__
+ *status = (last_status >> 8);
+#else
*status = last_status;
+#endif
last_reaped = last_pid;
return last_pid;
}