Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

merge from gcc

Browse Source
This commit is contained in:
DJ Delorie
2007-08-24 16:08:40 +00:00
parent 59678365bc
commit 29d89e071e
6 changed files with 69 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libiberty/pex-djgpp.c
View File

@@ -44,12 +44,12 @@ extern int errno;
static int pex_djgpp_open_read (struct pex_obj *, const char *, int);
static int pex_djgpp_open_write (struct pex_obj *, const char *, int);
static long pex_djgpp_exec_child (struct pex_obj *, int, const char *,
static pid_t pex_djgpp_exec_child (struct pex_obj *, int, const char *,
char * const *, char * const *,
int, int, int, int,
const char **, int *);
static int pex_djgpp_close (struct pex_obj *, int);
static int pex_djgpp_wait (struct pex_obj *, long, int *, struct pex_time *,
static int pex_djgpp_wait (struct pex_obj *, pid_t, int *, struct pex_time *,
int, const char **, int *);
/* The list of functions we pass to the common routines. */
@@ -110,7 +110,7 @@ pex_djgpp_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd)
/* Execute a child. */
static long
static pid_t
pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
char * const * argv, char * const * env,
int in, int out, int errdes,
@@ -132,19 +132,19 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
{
*err = errno;
*errmsg = "dup";
return -1;
return (pid_t) -1;
}
if (dup2 (in, STDIN_FILE_NO) < 0)
{
*err = errno;
*errmsg = "dup2";
return -1;
return (pid_t) -1;
}
if (close (in) < 0)
{
*err = errno;
*errmsg = "close";
return -1;
return (pid_t) -1;
}
}
@@ -155,19 +155,19 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
{
*err = errno;
*errmsg = "dup";
return -1;
return (pid_t) -1;
}
if (dup2 (out, STDOUT_FILE_NO) < 0)
{
*err = errno;
*errmsg = "dup2";
return -1;
return (pid_t) -1;
}
if (close (out) < 0)
{
*err = errno;
*errmsg = "close";
return -1;
return (pid_t) -1;
}
}
@@ -179,14 +179,14 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
{
*err = errno;
*errmsg = "dup";
return -1;
return (pid_t) -1;
}
if (dup2 ((flags & PEX_STDERR_TO_STDOUT) != 0 ? STDOUT_FILE_NO : errdes,
STDERR_FILE_NO) < 0)
{
*err = errno;
*errmsg = "dup2";
return -1;
return (pid_t) -1;
}
if (errdes != STDERR_FILE_NO)
{
@@ -194,7 +194,7 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
{
*err = errno;
*errmsg = "close";
return -1;
return (pid_t) -1;
}
}
}
@@ -218,13 +218,13 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
{
*err = errno;
*errmsg = "dup2";
return -1;
return (pid_t) -1;
}
if (close (org_in) < 0)
{
*err = errno;
*errmsg = "close";
return -1;
return (pid_t) -1;
}
}
@@ -234,13 +234,13 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
{
*err = errno;
*errmsg = "dup2";
return -1;
return (pid_t) -1;
}
if (close (org_out) < 0)
{
*err = errno;
*errmsg = "close";
return -1;
return (pid_t) -1;
}
}
@@ -251,13 +251,13 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
{
*err = errno;
*errmsg = "dup2";
return -1;
return (pid_t) -1;
}
if (close (org_errdes) < 0)
{
*err = errno;
*errmsg = "close";
return -1;
return (pid_t) -1;
}
}
@@ -269,7 +269,7 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
statuses[obj->count] = status;
obj->sysdep = (void *) statuses;
return obj->count;
return (pid_t) obj->count;
}
/* Wait for a child process to complete. Actually the child process
@@ -277,7 +277,7 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
status. */
static int
pex_djgpp_wait (struct pex_obj *obj, long pid, int *status,
pex_djgpp_wait (struct pex_obj *obj, pid_t pid, int *status,
struct pex_time *time, int done ATTRIBUTE_UNUSED,
const char **errmsg ATTRIBUTE_UNUSED,
int *err ATTRIBUTE_UNUSED)