X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=libiberty%2Fpex-djgpp.c;h=847cd15020508ecedc792d96e76b99199d777597;hb=9c4ab6fa7b06d1401b1d5354d0e415b9c9b819c3;hp=6e58e3fd8dcc864b975f7d220a5eb57e73a43387;hpb=d7cf8390c73e75b15e1d518c5707909f7c659938;p=gcc.git diff --git a/libiberty/pex-djgpp.c b/libiberty/pex-djgpp.c index 6e58e3fd8dc..847cd150205 100644 --- a/libiberty/pex-djgpp.c +++ b/libiberty/pex-djgpp.c @@ -1,7 +1,6 @@ /* Utilities to execute a program in a subprocess (possibly linked by pipes with other subprocesses), and wait for it. DJGPP specialization. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2005 - Free Software Foundation, Inc. + Copyright (C) 1996-2019 Free Software Foundation, Inc. This file is part of the libiberty library. Libiberty is free software; you can redistribute it and/or @@ -43,12 +42,13 @@ extern int errno; #endif 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 *, - char * const *, int, int, int, +static int pex_djgpp_open_write (struct pex_obj *, const char *, int, int); +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 pid_t 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. */ @@ -62,6 +62,7 @@ const struct pex_funcs funcs = pex_djgpp_wait, NULL, /* pipe */ NULL, /* fdopenr */ + NULL, /* fdopenw */ NULL /* cleanup */ }; @@ -88,10 +89,12 @@ pex_djgpp_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, static int pex_djgpp_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, - const char *name, int binary) + const char *name, int binary, int append) { /* Note that we can't use O_EXCL here because gcc may have already created the temporary file via make_temp_file. */ + if (append) + return -1; return open (name, (O_WRONLY | O_CREAT | O_TRUNC | (binary ? O_BINARY : O_TEXT)), @@ -108,10 +111,12 @@ 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, int in, int out, int errdes, - const char **errmsg, int *err) + char * const * argv, char * const * env, + int in, int out, int errdes, + int toclose ATTRIBUTE_UNUSED, const char **errmsg, + int *err) { int org_in, org_out, org_errdes; int status; @@ -128,19 +133,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; } } @@ -151,19 +156,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; } } @@ -175,14 +180,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) { @@ -190,13 +195,17 @@ pex_djgpp_exec_child (struct pex_obj *obj, int flags, const char *executable, { *err = errno; *errmsg = "close"; - return -1; + return (pid_t) -1; } } } - status = (((flags & PEX_SEARCH) != 0 ? spawnvp : spawnv) - (P_WAIT, executable, (char * const *) argv)); + if (env) + status = (((flags & PEX_SEARCH) != 0 ? spawnvpe : spawnve) + (P_WAIT, executable, argv, env)); + else + status = (((flags & PEX_SEARCH) != 0 ? spawnvp : spawnv) + (P_WAIT, executable, argv)); if (status == -1) { @@ -210,13 +219,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; } } @@ -226,13 +235,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; } } @@ -243,13 +252,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; } } @@ -261,15 +270,15 @@ 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 has already completed, and we just need to return the exit status. */ -static int -pex_djgpp_wait (struct pex_obj *obj, long pid, int *status, +static pid_t +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)