aboutsummaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2005-05-12 03:45:53 +0000
committerIan Lance Taylor <ian@airs.com>2005-05-12 03:45:53 +0000
commit282d9ec36bd4c9b9da5ef9676b6072b27adad33c (patch)
tree6e41727b658380e70dec80c97c44483318fecefd /libiberty
parentbe2c2e39a9d05fca8c6a2b82f1a0674da0aa35fb (diff)
downloadfsf-binutils-gdb-282d9ec36bd4c9b9da5ef9676b6072b27adad33c.zip
fsf-binutils-gdb-282d9ec36bd4c9b9da5ef9676b6072b27adad33c.tar.gz
fsf-binutils-gdb-282d9ec36bd4c9b9da5ef9676b6072b27adad33c.tar.bz2
2005-05-11 Eli Zaretskii <eliz@gnu.org>
* pex-djgpp.c: Include string.h, fcntl.h, unistd.h, and sys/stat.h. (pex_init): Fix last argument to pex_init_common. (pex_djgpp_exec_child): Remove leading underscore from _open, _dup, _dup2, _close, and _spawnv/_spawnvp. Replace `program', which is undeclared, with `executable', which was unused. Remove unused variable `e'. Fix casting of last arg to spawnv/spawnvp. (pex_djgpp_wait): Declare arguments with ATTRIBUTE_UNUSED.
Diffstat (limited to 'libiberty')
-rw-r--r--libiberty/ChangeLog11
-rw-r--r--libiberty/pex-djgpp.c79
2 files changed, 52 insertions, 38 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 4fa2403..63dba8e 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,14 @@
+2005-05-11 Eli Zaretskii <eliz@gnu.org>
+
+ * pex-djgpp.c: Include string.h, fcntl.h, unistd.h, and
+ sys/stat.h.
+ (pex_init): Fix last argument to pex_init_common.
+ (pex_djgpp_exec_child): Remove leading underscore from _open,
+ _dup, _dup2, _close, and _spawnv/_spawnvp. Replace `program',
+ which is undeclared, with `executable', which was unused. Remove
+ unused variable `e'. Fix casting of last arg to spawnv/spawnvp.
+ (pex_djgpp_wait): Declare arguments with ATTRIBUTE_UNUSED.
+
2005-05-11 Paul Brook <paul@codesourcery.com>
* Makefile.in: Regenerate dependencies.
diff --git a/libiberty/pex-djgpp.c b/libiberty/pex-djgpp.c
index 65a02b8..b452f46 100644
--- a/libiberty/pex-djgpp.c
+++ b/libiberty/pex-djgpp.c
@@ -29,6 +29,10 @@ extern int errno;
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
+#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
#include <process.h>
/* Use ECHILD if available, otherwise use EINVAL. */
@@ -68,7 +72,7 @@ pex_init (int flags, const char *pname, const char *tempbase)
{
/* DJGPP does not support pipes. */
flags &= ~ PEX_USE_PIPES;
- return pex_init_common (flags, pname, tempbase, funcs);
+ return pex_init_common (flags, pname, tempbase, &funcs);
}
/* Open a file for reading. */
@@ -119,46 +123,46 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
if (in != STDIN_FILE_NO)
{
- org_in = _dup (STDIN_FILE_NO);
+ org_in = dup (STDIN_FILE_NO);
if (org_in < 0)
{
*err = errno;
- *errmsg = "_dup";
+ *errmsg = "dup";
return -1;
}
- if (_dup2 (in, STDIN_FILE_NO) < 0)
+ if (dup2 (in, STDIN_FILE_NO) < 0)
{
*err = errno;
- *errmsg = "_dup2";
+ *errmsg = "dup2";
return -1;
}
- if (_close (in) < 0)
+ if (close (in) < 0)
{
*err = errno;
- *errmsg = "_close";
+ *errmsg = "close";
return -1;
}
}
if (out != STDOUT_FILE_NO)
{
- org_out = _dup (STDOUT_FILE_NO);
+ org_out = dup (STDOUT_FILE_NO);
if (org_out < 0)
{
*err = errno;
- *errmsg = "_dup";
+ *errmsg = "dup";
return -1;
}
- if (_dup2 (out, STDOUT_FILE_NO) < 0)
+ if (dup2 (out, STDOUT_FILE_NO) < 0)
{
*err = errno;
- *errmsg = "_dup2";
+ *errmsg = "dup2";
return -1;
}
- if (_close (out) < 0)
+ if (close (out) < 0)
{
*err = errno;
- *errmsg = "_close";
+ *errmsg = "close";
return -1;
}
}
@@ -166,70 +170,68 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
if (errdes != STDERR_FILE_NO
|| (flags & PEX_STDERR_TO_STDOUT) != 0)
{
- int e;
-
- org_errdes = _dup (STDERR_FILE_NO);
+ org_errdes = dup (STDERR_FILE_NO);
if (org_errdes < 0)
{
*err = errno;
- *errmsg = "_dup";
+ *errmsg = "dup";
return -1;
}
- if (_dup2 ((flags & PEX_STDERR_TO_STDOUT) != 0 ? STDOUT_FILE_NO : errdes,
+ if (dup2 ((flags & PEX_STDERR_TO_STDOUT) != 0 ? STDOUT_FILE_NO : errdes,
STDERR_FILE_NO) < 0)
{
*err = errno;
- *errmsg = "_dup2";
+ *errmsg = "dup2";
return -1;
}
if (errdes != STDERR_FILE_NO)
{
- if (_close (errdes) < 0)
+ if (close (errdes) < 0)
{
*err = errno;
- *errmsg = "_close";
+ *errmsg = "close";
return -1;
}
}
}
- status = (((flags & PEX_SEARCH) != 0 ? _spawnvp : _spawnv)
- (P_WAIT, program, (const char **) argv));
+ status = (((flags & PEX_SEARCH) != 0 ? spawnvp : spawnv)
+ (P_WAIT, executable, (char * const *) argv));
if (status == -1)
{
*err = errno;
- *errmsg = ((flags & PEX_SEARCH) != 0) ? "_spawnvp" : "_spawnv";
+ *errmsg = ((flags & PEX_SEARCH) != 0) ? "spawnvp" : "spawnv";
}
if (in != STDIN_FILE_NO)
{
- if (_dup2 (org_in, STDIN_FILE_NO) < 0)
+ if (dup2 (org_in, STDIN_FILE_NO) < 0)
{
*err = errno;
- *errmsg = "_dup2";
+ *errmsg = "dup2";
return -1;
}
- if (_close (org_in) < 0)
+ if (close (org_in) < 0)
{
*err = errno;
- *errmsg = "_close";
+ *errmsg = "close";
return -1;
}
}
if (out != STDOUT_FILE_NO)
{
- if (_dup2 (org_out, STDOUT_FILE_NO) < 0)
+ if (dup2 (org_out, STDOUT_FILE_NO) < 0)
{
*err = errno;
- *errmsg = "_dup2";
+ *errmsg = "dup2";
return -1;
}
- if (_close (org_out) < 0)
+ if (close (org_out) < 0)
{
*err = errno;
- *errmsg = "_close";
+ *errmsg = "close";
return -1;
}
}
@@ -237,16 +239,16 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
if (errdes != STDERR_FILE_NO
|| (flags & PEX_STDERR_TO_STDOUT) != 0)
{
- if (_dup2 (org_errdes, STDERR_FILE_NO) < 0)
+ if (dup2 (org_errdes, STDERR_FILE_NO) < 0)
{
*err = errno;
- *errmsg = "_dup2";
+ *errmsg = "dup2";
return -1;
}
- if (_close (org_errdes) < 0)
+ if (close (org_errdes) < 0)
{
*err = errno;
- *errmsg = "_close";
+ *errmsg = "close";
return -1;
}
}
@@ -268,8 +270,9 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable,
static int
pex_djgpp_wait (struct pex_obj *obj, long pid, int *status,
- struct pex_time *time, int done, const char **errmsg,
- int *err)
+ struct pex_time *time, int done ATTRIBUTE_UNUSED,
+ const char **errmsg ATTRIBUTE_UNUSED,
+ int *err ATTRIBUTE_UNUSED)
{
int *statuses;