2003-01-24 22:31:35 +01:00
|
|
|
/* Utilities to execute a program in a subprocess (possibly linked by pipes
|
|
|
|
with other subprocesses), and wait for it. Generic Win32 specialization.
|
2006-10-26 06:18:42 +02:00
|
|
|
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
|
2003-01-24 22:31:35 +01:00
|
|
|
Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
This file is part of the libiberty library.
|
|
|
|
Libiberty is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU Library General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
Libiberty is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Library General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
|
|
License along with libiberty; see the file COPYING.LIB. If not,
|
2005-05-10 17:33:34 +02:00
|
|
|
write to the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor,
|
|
|
|
Boston, MA 02110-1301, USA. */
|
2003-01-24 22:31:35 +01:00
|
|
|
|
|
|
|
#include "pex-common.h"
|
|
|
|
|
2005-09-15 03:04:05 +02:00
|
|
|
#include <windows.h>
|
|
|
|
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
#ifdef HAVE_STDLIB_H
|
|
|
|
#include <stdlib.h>
|
|
|
|
#endif
|
2003-01-24 22:31:35 +01:00
|
|
|
#ifdef HAVE_STRING_H
|
|
|
|
#include <string.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_WAIT_H
|
|
|
|
#include <sys/wait.h>
|
|
|
|
#endif
|
|
|
|
|
2006-06-01 16:57:50 +02:00
|
|
|
#include <assert.h>
|
2003-01-24 22:31:35 +01:00
|
|
|
#include <process.h>
|
|
|
|
#include <io.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <signal.h>
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
#include <sys/stat.h>
|
2006-04-01 01:01:16 +02:00
|
|
|
#include <errno.h>
|
2006-06-01 16:57:50 +02:00
|
|
|
#include <ctype.h>
|
2003-01-24 22:31:35 +01:00
|
|
|
|
|
|
|
/* mingw32 headers may not define the following. */
|
|
|
|
|
|
|
|
#ifndef _P_WAIT
|
|
|
|
# define _P_WAIT 0
|
|
|
|
# define _P_NOWAIT 1
|
|
|
|
# define _P_OVERLAY 2
|
|
|
|
# define _P_NOWAITO 3
|
|
|
|
# define _P_DETACH 4
|
|
|
|
|
|
|
|
# define WAIT_CHILD 0
|
|
|
|
# define WAIT_GRANDCHILD 1
|
|
|
|
#endif
|
|
|
|
|
2005-09-15 03:04:05 +02:00
|
|
|
#define MINGW_NAME "Minimalist GNU for Windows"
|
|
|
|
#define MINGW_NAME_LEN (sizeof(MINGW_NAME) - 1)
|
|
|
|
|
2006-06-01 16:57:50 +02:00
|
|
|
extern char *stpcpy (char *dst, const char *src);
|
|
|
|
|
2005-09-15 03:04:05 +02:00
|
|
|
/* Ensure that the executable pathname uses Win32 backslashes. This
|
|
|
|
is not necessary on NT, but on W9x, forward slashes causes
|
|
|
|
failure of spawn* and exec* functions (and probably any function
|
|
|
|
that calls CreateProcess) *iff* the executable pathname (argv[0])
|
|
|
|
is a quoted string. And quoting is necessary in case a pathname
|
|
|
|
contains embedded white space. You can't win. */
|
|
|
|
static void
|
|
|
|
backslashify (char *s)
|
|
|
|
{
|
|
|
|
while ((s = strchr (s, '/')) != NULL)
|
|
|
|
*s = '\\';
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
static int pex_win32_open_read (struct pex_obj *, const char *, int);
|
|
|
|
static int pex_win32_open_write (struct pex_obj *, const char *, int);
|
2007-08-24 18:08:40 +02:00
|
|
|
static pid_t pex_win32_exec_child (struct pex_obj *, int, const char *,
|
2006-06-01 16:57:50 +02:00
|
|
|
char * const *, char * const *,
|
2006-08-28 02:56:25 +02:00
|
|
|
int, int, int, int,
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
const char **, int *);
|
|
|
|
static int pex_win32_close (struct pex_obj *, int);
|
2009-04-13 12:48:27 +02:00
|
|
|
static pid_t pex_win32_wait (struct pex_obj *, pid_t, int *,
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
struct pex_time *, int, const char **, int *);
|
|
|
|
static int pex_win32_pipe (struct pex_obj *, int *, int);
|
|
|
|
static FILE *pex_win32_fdopenr (struct pex_obj *, int, int);
|
2006-04-12 20:42:01 +02:00
|
|
|
static FILE *pex_win32_fdopenw (struct pex_obj *, int, int);
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
|
|
|
|
/* The list of functions we pass to the common routines. */
|
|
|
|
|
|
|
|
const struct pex_funcs funcs =
|
2003-01-24 22:31:35 +01:00
|
|
|
{
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
pex_win32_open_read,
|
|
|
|
pex_win32_open_write,
|
|
|
|
pex_win32_exec_child,
|
|
|
|
pex_win32_close,
|
|
|
|
pex_win32_wait,
|
|
|
|
pex_win32_pipe,
|
|
|
|
pex_win32_fdopenr,
|
2006-04-12 20:42:01 +02:00
|
|
|
pex_win32_fdopenw,
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
NULL /* cleanup */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Return a newly initialized pex_obj structure. */
|
|
|
|
|
|
|
|
struct pex_obj *
|
|
|
|
pex_init (int flags, const char *pname, const char *tempbase)
|
|
|
|
{
|
|
|
|
return pex_init_common (flags, pname, tempbase, &funcs);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Open a file for reading. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
pex_win32_open_read (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name,
|
|
|
|
int binary)
|
|
|
|
{
|
|
|
|
return _open (name, _O_RDONLY | (binary ? _O_BINARY : _O_TEXT));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Open a file for writing. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
pex_win32_open_write (struct pex_obj *obj ATTRIBUTE_UNUSED, const char *name,
|
|
|
|
int binary)
|
|
|
|
{
|
|
|
|
/* Note that we can't use O_EXCL here because gcc may have already
|
|
|
|
created the temporary file via make_temp_file. */
|
|
|
|
return _open (name,
|
|
|
|
(_O_WRONLY | _O_CREAT | _O_TRUNC
|
|
|
|
| (binary ? _O_BINARY : _O_TEXT)),
|
|
|
|
_S_IREAD | _S_IWRITE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Close a file. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
pex_win32_close (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd)
|
|
|
|
{
|
|
|
|
return _close (fd);
|
|
|
|
}
|
|
|
|
|
2005-09-15 03:04:05 +02:00
|
|
|
#ifdef USE_MINGW_MSYS
|
|
|
|
static const char *mingw_keys[] = {"SOFTWARE", "Microsoft", "Windows", "CurrentVersion", "Uninstall", NULL};
|
|
|
|
|
|
|
|
/* Tack the executable on the end of a (possibly slash terminated) buffer
|
|
|
|
and convert everything to \. */
|
|
|
|
static const char *
|
|
|
|
tack_on_executable (char *buf, const char *executable)
|
|
|
|
{
|
|
|
|
char *p = strchr (buf, '\0');
|
|
|
|
if (p > buf && (p[-1] == '\\' || p[-1] == '/'))
|
|
|
|
p[-1] = '\0';
|
|
|
|
backslashify (strcat (buf, executable));
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Walk down a registry hierarchy until the end. Return the key. */
|
|
|
|
static HKEY
|
|
|
|
openkey (HKEY hStart, const char *keys[])
|
|
|
|
{
|
|
|
|
HKEY hKey, hTmp;
|
|
|
|
for (hKey = hStart; *keys; keys++)
|
|
|
|
{
|
|
|
|
LONG res;
|
|
|
|
hTmp = hKey;
|
|
|
|
res = RegOpenKey (hTmp, *keys, &hKey);
|
|
|
|
|
|
|
|
if (hTmp != HKEY_LOCAL_MACHINE)
|
|
|
|
RegCloseKey (hTmp);
|
|
|
|
|
|
|
|
if (res != ERROR_SUCCESS)
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return hKey;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the "mingw root" as derived from the mingw uninstall information. */
|
|
|
|
static const char *
|
|
|
|
mingw_rootify (const char *executable)
|
|
|
|
{
|
|
|
|
HKEY hKey, hTmp;
|
|
|
|
DWORD maxlen;
|
|
|
|
char *namebuf, *foundbuf;
|
|
|
|
DWORD i;
|
|
|
|
LONG res;
|
|
|
|
|
|
|
|
/* Open the uninstall "directory". */
|
|
|
|
hKey = openkey (HKEY_LOCAL_MACHINE, mingw_keys);
|
|
|
|
|
|
|
|
/* Not found. */
|
|
|
|
if (!hKey)
|
|
|
|
return executable;
|
|
|
|
|
|
|
|
/* Need to enumerate all of the keys here looking for one the most recent
|
|
|
|
one for MinGW. */
|
|
|
|
if (RegQueryInfoKey (hKey, NULL, NULL, NULL, NULL, &maxlen, NULL, NULL,
|
|
|
|
NULL, NULL, NULL, NULL) != ERROR_SUCCESS)
|
|
|
|
{
|
|
|
|
RegCloseKey (hKey);
|
|
|
|
return executable;
|
|
|
|
}
|
|
|
|
namebuf = XNEWVEC (char, ++maxlen);
|
|
|
|
foundbuf = XNEWVEC (char, maxlen);
|
|
|
|
foundbuf[0] = '\0';
|
|
|
|
if (!namebuf || !foundbuf)
|
|
|
|
{
|
|
|
|
RegCloseKey (hKey);
|
2011-04-20 21:06:46 +02:00
|
|
|
free (namebuf);
|
|
|
|
free (foundbuf);
|
2005-09-15 03:04:05 +02:00
|
|
|
return executable;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Look through all of the keys for one that begins with Minimal GNU...
|
|
|
|
Try to get the latest version by doing a string compare although that
|
|
|
|
string never really works with version number sorting. */
|
|
|
|
for (i = 0; RegEnumKey (hKey, i, namebuf, maxlen) == ERROR_SUCCESS; i++)
|
|
|
|
{
|
|
|
|
int match = strcasecmp (namebuf, MINGW_NAME);
|
|
|
|
if (match < 0)
|
|
|
|
continue;
|
|
|
|
if (match > 0 && strncasecmp (namebuf, MINGW_NAME, MINGW_NAME_LEN) > 0)
|
|
|
|
continue;
|
|
|
|
if (strcasecmp (namebuf, foundbuf) > 0)
|
|
|
|
strcpy (foundbuf, namebuf);
|
|
|
|
}
|
|
|
|
free (namebuf);
|
|
|
|
|
|
|
|
/* If foundbuf is empty, we didn't find anything. Punt. */
|
|
|
|
if (!foundbuf[0])
|
|
|
|
{
|
|
|
|
free (foundbuf);
|
|
|
|
RegCloseKey (hKey);
|
|
|
|
return executable;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Open the key that we wanted */
|
|
|
|
res = RegOpenKey (hKey, foundbuf, &hTmp);
|
|
|
|
RegCloseKey (hKey);
|
|
|
|
free (foundbuf);
|
|
|
|
|
|
|
|
/* Don't know why this would fail, but you gotta check */
|
|
|
|
if (res != ERROR_SUCCESS)
|
|
|
|
return executable;
|
|
|
|
|
|
|
|
maxlen = 0;
|
|
|
|
/* Get the length of the value pointed to by InstallLocation */
|
|
|
|
if (RegQueryValueEx (hTmp, "InstallLocation", 0, NULL, NULL,
|
|
|
|
&maxlen) != ERROR_SUCCESS || maxlen == 0)
|
|
|
|
{
|
|
|
|
RegCloseKey (hTmp);
|
|
|
|
return executable;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate space for the install location */
|
|
|
|
foundbuf = XNEWVEC (char, maxlen + strlen (executable));
|
|
|
|
if (!foundbuf)
|
|
|
|
{
|
|
|
|
free (foundbuf);
|
|
|
|
RegCloseKey (hTmp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the install location into the buffer */
|
|
|
|
res = RegQueryValueEx (hTmp, "InstallLocation", 0, NULL, (LPBYTE) foundbuf,
|
|
|
|
&maxlen);
|
|
|
|
RegCloseKey (hTmp);
|
|
|
|
if (res != ERROR_SUCCESS)
|
|
|
|
{
|
|
|
|
free (foundbuf);
|
|
|
|
return executable;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Concatenate the install location and the executable, turn all slashes
|
|
|
|
to backslashes, and return that. */
|
|
|
|
return tack_on_executable (foundbuf, executable);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the install location of msys from it's installation file and
|
|
|
|
rootify the executable based on that. */
|
|
|
|
static const char *
|
|
|
|
msys_rootify (const char *executable)
|
|
|
|
{
|
|
|
|
size_t bufsize = 64;
|
|
|
|
size_t execlen = strlen (executable) + 1;
|
|
|
|
char *buf;
|
|
|
|
DWORD res = 0;
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
buf = XNEWVEC (char, bufsize + execlen);
|
|
|
|
if (!buf)
|
|
|
|
break;
|
|
|
|
res = GetPrivateProfileString ("InstallSettings", "InstallPath", NULL,
|
|
|
|
buf, bufsize, "msys.ini");
|
|
|
|
if (!res)
|
|
|
|
break;
|
|
|
|
if (strlen (buf) < bufsize)
|
|
|
|
break;
|
|
|
|
res = 0;
|
|
|
|
free (buf);
|
|
|
|
bufsize *= 2;
|
|
|
|
if (bufsize > 65536)
|
|
|
|
{
|
|
|
|
buf = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (res)
|
|
|
|
return tack_on_executable (buf, executable);
|
|
|
|
|
|
|
|
/* failed */
|
2011-04-20 21:06:46 +02:00
|
|
|
free (buf);
|
2005-09-15 03:04:05 +02:00
|
|
|
return executable;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-08-07 22:00:53 +02:00
|
|
|
/* Return the number of arguments in an argv array, not including the null
|
|
|
|
terminating argument. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
argv_to_argc (char *const *argv)
|
|
|
|
{
|
|
|
|
char *const *i = argv;
|
|
|
|
while (*i)
|
|
|
|
i++;
|
|
|
|
return i - argv;
|
|
|
|
}
|
|
|
|
|
2006-04-01 01:01:16 +02:00
|
|
|
/* Return a Windows command-line from ARGV. It is the caller's
|
|
|
|
responsibility to free the string returned. */
|
|
|
|
|
|
|
|
static char *
|
|
|
|
argv_to_cmdline (char *const *argv)
|
|
|
|
{
|
|
|
|
char *cmdline;
|
|
|
|
char *p;
|
|
|
|
size_t cmdline_len;
|
|
|
|
int i, j, k;
|
2014-06-01 22:11:56 +02:00
|
|
|
int needs_quotes;
|
2006-04-01 01:01:16 +02:00
|
|
|
|
|
|
|
cmdline_len = 0;
|
|
|
|
for (i = 0; argv[i]; i++)
|
|
|
|
{
|
2014-06-01 22:11:56 +02:00
|
|
|
/* We only quote arguments that contain spaces, \t or " characters to
|
|
|
|
prevent wasting 2 chars per argument of the CreateProcess 32k char
|
|
|
|
limit. We need only escape embedded double-quotes and immediately
|
2006-04-01 01:01:16 +02:00
|
|
|
preceeding backslash characters. A sequence of backslach characters
|
|
|
|
that is not follwed by a double quote character will not be
|
|
|
|
escaped. */
|
2014-06-01 22:11:56 +02:00
|
|
|
needs_quotes = 0;
|
2006-04-01 01:01:16 +02:00
|
|
|
for (j = 0; argv[i][j]; j++)
|
|
|
|
{
|
2014-06-01 22:11:56 +02:00
|
|
|
if (argv[i][j] == ' ' || argv[i][j] == '\t' || argv[i][j] == '"')
|
|
|
|
{
|
|
|
|
needs_quotes = 1;
|
|
|
|
}
|
|
|
|
|
2006-04-01 01:01:16 +02:00
|
|
|
if (argv[i][j] == '"')
|
|
|
|
{
|
|
|
|
/* Escape preceeding backslashes. */
|
|
|
|
for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--)
|
|
|
|
cmdline_len++;
|
|
|
|
/* Escape the qote character. */
|
|
|
|
cmdline_len++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Trailing backslashes also need to be escaped because they will be
|
|
|
|
followed by the terminating quote. */
|
2014-06-01 22:11:56 +02:00
|
|
|
if (needs_quotes)
|
|
|
|
{
|
|
|
|
for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--)
|
|
|
|
cmdline_len++;
|
|
|
|
}
|
2006-04-01 01:01:16 +02:00
|
|
|
cmdline_len += j;
|
2014-06-01 22:11:56 +02:00
|
|
|
/* for leading and trailing quotes and space */
|
|
|
|
cmdline_len += needs_quotes * 2 + 1;
|
2006-04-01 01:01:16 +02:00
|
|
|
}
|
2006-10-26 06:18:42 +02:00
|
|
|
cmdline = XNEWVEC (char, cmdline_len);
|
2006-04-01 01:01:16 +02:00
|
|
|
p = cmdline;
|
|
|
|
for (i = 0; argv[i]; i++)
|
|
|
|
{
|
2014-06-01 22:11:56 +02:00
|
|
|
needs_quotes = 0;
|
|
|
|
for (j = 0; argv[i][j]; j++)
|
|
|
|
{
|
|
|
|
if (argv[i][j] == ' ' || argv[i][j] == '\t' || argv[i][j] == '"')
|
|
|
|
{
|
|
|
|
needs_quotes = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (needs_quotes)
|
|
|
|
{
|
|
|
|
*p++ = '"';
|
|
|
|
}
|
2006-04-01 01:01:16 +02:00
|
|
|
for (j = 0; argv[i][j]; j++)
|
|
|
|
{
|
|
|
|
if (argv[i][j] == '"')
|
|
|
|
{
|
|
|
|
for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--)
|
|
|
|
*p++ = '\\';
|
|
|
|
*p++ = '\\';
|
|
|
|
}
|
|
|
|
*p++ = argv[i][j];
|
|
|
|
}
|
2014-06-01 22:11:56 +02:00
|
|
|
if (needs_quotes)
|
|
|
|
{
|
|
|
|
for (k = j - 1; k >= 0 && argv[i][k] == '\\'; k--)
|
|
|
|
*p++ = '\\';
|
|
|
|
*p++ = '"';
|
|
|
|
}
|
2006-04-01 01:01:16 +02:00
|
|
|
*p++ = ' ';
|
|
|
|
}
|
|
|
|
p[-1] = '\0';
|
|
|
|
return cmdline;
|
|
|
|
}
|
|
|
|
|
2006-11-08 17:18:58 +01:00
|
|
|
/* We'll try the passed filename with all the known standard
|
|
|
|
extensions, and then without extension. We try no extension
|
|
|
|
last so that we don't try to run some random extension-less
|
|
|
|
file that might be hanging around. We try both extension
|
|
|
|
and no extension so that we don't need any fancy logic
|
|
|
|
to determine if a file has extension. */
|
2006-04-01 01:01:16 +02:00
|
|
|
static const char *const
|
|
|
|
std_suffixes[] = {
|
|
|
|
".com",
|
|
|
|
".exe",
|
|
|
|
".bat",
|
|
|
|
".cmd",
|
|
|
|
"",
|
|
|
|
0
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Returns the full path to PROGRAM. If SEARCH is true, look for
|
|
|
|
PROGRAM in each directory in PATH. */
|
|
|
|
|
|
|
|
static char *
|
|
|
|
find_executable (const char *program, BOOL search)
|
|
|
|
{
|
|
|
|
char *full_executable;
|
|
|
|
char *e;
|
|
|
|
size_t fe_len;
|
|
|
|
const char *path = 0;
|
|
|
|
const char *const *ext;
|
|
|
|
const char *p, *q;
|
|
|
|
size_t proglen = strlen (program);
|
|
|
|
int has_slash = (strchr (program, '/') || strchr (program, '\\'));
|
|
|
|
HANDLE h;
|
|
|
|
|
|
|
|
if (has_slash)
|
|
|
|
search = FALSE;
|
|
|
|
|
|
|
|
if (search)
|
|
|
|
path = getenv ("PATH");
|
|
|
|
if (!path)
|
|
|
|
path = "";
|
|
|
|
|
|
|
|
fe_len = 0;
|
|
|
|
for (p = path; *p; p = q)
|
|
|
|
{
|
|
|
|
q = p;
|
|
|
|
while (*q != ';' && *q != '\0')
|
|
|
|
q++;
|
|
|
|
if ((size_t)(q - p) > fe_len)
|
|
|
|
fe_len = q - p;
|
|
|
|
if (*q == ';')
|
|
|
|
q++;
|
|
|
|
}
|
2006-11-08 17:18:58 +01:00
|
|
|
fe_len = fe_len + 1 + proglen + 5 /* space for extension */;
|
2006-10-26 06:18:42 +02:00
|
|
|
full_executable = XNEWVEC (char, fe_len);
|
2006-04-01 01:01:16 +02:00
|
|
|
|
|
|
|
p = path;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
q = p;
|
|
|
|
while (*q != ';' && *q != '\0')
|
|
|
|
q++;
|
|
|
|
|
|
|
|
e = full_executable;
|
|
|
|
memcpy (e, p, q - p);
|
|
|
|
e += (q - p);
|
|
|
|
if (q - p)
|
|
|
|
*e++ = '\\';
|
|
|
|
strcpy (e, program);
|
|
|
|
|
|
|
|
if (*q == ';')
|
|
|
|
q++;
|
|
|
|
|
|
|
|
for (e = full_executable; *e; e++)
|
|
|
|
if (*e == '/')
|
|
|
|
*e = '\\';
|
|
|
|
|
|
|
|
/* At this point, e points to the terminating NUL character for
|
|
|
|
full_executable. */
|
2006-11-08 17:18:58 +01:00
|
|
|
for (ext = std_suffixes; *ext; ext++)
|
2006-04-01 01:01:16 +02:00
|
|
|
{
|
|
|
|
/* Remove any current extension. */
|
|
|
|
*e = '\0';
|
|
|
|
/* Add the new one. */
|
|
|
|
strcat (full_executable, *ext);
|
|
|
|
|
|
|
|
/* Attempt to open this file. */
|
|
|
|
h = CreateFile (full_executable, GENERIC_READ,
|
|
|
|
FILE_SHARE_READ | FILE_SHARE_WRITE,
|
|
|
|
0, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
|
|
|
|
if (h != INVALID_HANDLE_VALUE)
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
p = q;
|
|
|
|
}
|
|
|
|
while (*p);
|
|
|
|
free (full_executable);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
found:
|
|
|
|
CloseHandle (h);
|
|
|
|
return full_executable;
|
|
|
|
}
|
|
|
|
|
2006-06-01 16:57:50 +02:00
|
|
|
/* Low-level process creation function and helper. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
env_compare (const void *a_ptr, const void *b_ptr)
|
|
|
|
{
|
|
|
|
const char *a;
|
|
|
|
const char *b;
|
|
|
|
unsigned char c1;
|
|
|
|
unsigned char c2;
|
|
|
|
|
|
|
|
a = *(const char **) a_ptr;
|
|
|
|
b = *(const char **) b_ptr;
|
|
|
|
|
|
|
|
/* a and b will be of the form: VAR=VALUE
|
|
|
|
We compare only the variable name part here using a case-insensitive
|
|
|
|
comparison algorithm. It might appear that in fact strcasecmp () can
|
|
|
|
take the place of this whole function, and indeed it could, save for
|
|
|
|
the fact that it would fail in cases such as comparing A1=foo and
|
|
|
|
A=bar (because 1 is less than = in the ASCII character set).
|
|
|
|
(Environment variables containing no numbers would work in such a
|
|
|
|
scenario.) */
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
c1 = (unsigned char) tolower (*a++);
|
|
|
|
c2 = (unsigned char) tolower (*b++);
|
|
|
|
|
|
|
|
if (c1 == '=')
|
|
|
|
c1 = '\0';
|
|
|
|
|
|
|
|
if (c2 == '=')
|
|
|
|
c2 = '\0';
|
|
|
|
}
|
|
|
|
while (c1 == c2 && c1 != '\0');
|
|
|
|
|
|
|
|
return c1 - c2;
|
|
|
|
}
|
2006-04-01 01:01:16 +02:00
|
|
|
|
2008-08-07 22:00:53 +02:00
|
|
|
/* Execute a Windows executable as a child process. This will fail if the
|
|
|
|
* target is not actually an executable, such as if it is a shell script. */
|
|
|
|
|
2007-08-24 18:08:40 +02:00
|
|
|
static pid_t
|
2006-04-01 01:01:16 +02:00
|
|
|
win32_spawn (const char *executable,
|
|
|
|
BOOL search,
|
|
|
|
char *const *argv,
|
2006-06-01 16:57:50 +02:00
|
|
|
char *const *env, /* array of strings of the form: VAR=VALUE */
|
2006-04-01 01:01:16 +02:00
|
|
|
DWORD dwCreationFlags,
|
|
|
|
LPSTARTUPINFO si,
|
|
|
|
LPPROCESS_INFORMATION pi)
|
|
|
|
{
|
|
|
|
char *full_executable;
|
|
|
|
char *cmdline;
|
2006-06-01 16:57:50 +02:00
|
|
|
char **env_copy;
|
|
|
|
char *env_block = NULL;
|
2006-04-01 01:01:16 +02:00
|
|
|
|
|
|
|
full_executable = NULL;
|
|
|
|
cmdline = NULL;
|
|
|
|
|
2006-06-01 16:57:50 +02:00
|
|
|
if (env)
|
|
|
|
{
|
|
|
|
int env_size;
|
|
|
|
|
|
|
|
/* Count the number of environment bindings supplied. */
|
|
|
|
for (env_size = 0; env[env_size]; env_size++)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Assemble an environment block, if required. This consists of
|
|
|
|
VAR=VALUE strings juxtaposed (with one null character between each
|
|
|
|
pair) and an additional null at the end. */
|
|
|
|
if (env_size > 0)
|
|
|
|
{
|
|
|
|
int var;
|
|
|
|
int total_size = 1; /* 1 is for the final null. */
|
|
|
|
char *bufptr;
|
|
|
|
|
|
|
|
/* Windows needs the members of the block to be sorted by variable
|
|
|
|
name. */
|
2006-10-26 06:18:42 +02:00
|
|
|
env_copy = (char **) alloca (sizeof (char *) * env_size);
|
2006-06-01 16:57:50 +02:00
|
|
|
memcpy (env_copy, env, sizeof (char *) * env_size);
|
|
|
|
qsort (env_copy, env_size, sizeof (char *), env_compare);
|
|
|
|
|
|
|
|
for (var = 0; var < env_size; var++)
|
|
|
|
total_size += strlen (env[var]) + 1;
|
|
|
|
|
2006-10-26 06:18:42 +02:00
|
|
|
env_block = XNEWVEC (char, total_size);
|
2006-06-01 16:57:50 +02:00
|
|
|
bufptr = env_block;
|
|
|
|
for (var = 0; var < env_size; var++)
|
|
|
|
bufptr = stpcpy (bufptr, env_copy[var]) + 1;
|
|
|
|
|
|
|
|
*bufptr = '\0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-04-01 01:01:16 +02:00
|
|
|
full_executable = find_executable (executable, search);
|
|
|
|
if (!full_executable)
|
|
|
|
goto error;
|
|
|
|
cmdline = argv_to_cmdline (argv);
|
|
|
|
if (!cmdline)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Create the child process. */
|
|
|
|
if (!CreateProcess (full_executable, cmdline,
|
|
|
|
/*lpProcessAttributes=*/NULL,
|
|
|
|
/*lpThreadAttributes=*/NULL,
|
|
|
|
/*bInheritHandles=*/TRUE,
|
|
|
|
dwCreationFlags,
|
2006-06-01 16:57:50 +02:00
|
|
|
(LPVOID) env_block,
|
2006-04-01 01:01:16 +02:00
|
|
|
/*lpCurrentDirectory=*/NULL,
|
|
|
|
si,
|
|
|
|
pi))
|
|
|
|
{
|
2011-04-20 21:06:46 +02:00
|
|
|
free (env_block);
|
2006-06-01 16:57:50 +02:00
|
|
|
|
2006-04-01 01:01:16 +02:00
|
|
|
free (full_executable);
|
2006-06-01 16:57:50 +02:00
|
|
|
|
2007-08-24 18:08:40 +02:00
|
|
|
return (pid_t) -1;
|
2006-04-01 01:01:16 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Clean up. */
|
|
|
|
CloseHandle (pi->hThread);
|
|
|
|
free (full_executable);
|
2011-04-20 21:06:46 +02:00
|
|
|
free (env_block);
|
2006-04-01 01:01:16 +02:00
|
|
|
|
2007-08-24 18:08:40 +02:00
|
|
|
return (pid_t) pi->hProcess;
|
2006-04-01 01:01:16 +02:00
|
|
|
|
|
|
|
error:
|
2011-04-20 21:06:46 +02:00
|
|
|
free (env_block);
|
|
|
|
free (cmdline);
|
|
|
|
free (full_executable);
|
2006-06-01 16:57:50 +02:00
|
|
|
|
2007-08-24 18:08:40 +02:00
|
|
|
return (pid_t) -1;
|
2006-04-01 01:01:16 +02:00
|
|
|
}
|
|
|
|
|
2008-08-07 22:00:53 +02:00
|
|
|
/* Spawn a script. This simulates the Unix script execution mechanism.
|
|
|
|
This function is called as a fallback if win32_spawn fails. */
|
|
|
|
|
2007-08-24 18:08:40 +02:00
|
|
|
static pid_t
|
2006-04-01 01:01:16 +02:00
|
|
|
spawn_script (const char *executable, char *const *argv,
|
2006-06-01 16:57:50 +02:00
|
|
|
char* const *env,
|
2006-04-01 01:01:16 +02:00
|
|
|
DWORD dwCreationFlags,
|
|
|
|
LPSTARTUPINFO si,
|
|
|
|
LPPROCESS_INFORMATION pi)
|
2005-09-15 03:04:05 +02:00
|
|
|
{
|
2007-08-24 18:08:40 +02:00
|
|
|
pid_t pid = (pid_t) -1;
|
2005-09-15 03:04:05 +02:00
|
|
|
int save_errno = errno;
|
|
|
|
int fd = _open (executable, _O_RDONLY);
|
|
|
|
|
2008-08-07 22:00:53 +02:00
|
|
|
/* Try to open script, check header format, extract interpreter path,
|
|
|
|
and spawn script using that interpretter. */
|
2005-09-15 03:04:05 +02:00
|
|
|
if (fd >= 0)
|
|
|
|
{
|
|
|
|
char buf[MAX_PATH + 5];
|
|
|
|
int len = _read (fd, buf, sizeof (buf) - 1);
|
|
|
|
_close (fd);
|
|
|
|
if (len > 3)
|
|
|
|
{
|
|
|
|
char *eol;
|
|
|
|
buf[len] = '\0';
|
|
|
|
eol = strchr (buf, '\n');
|
|
|
|
if (eol && strncmp (buf, "#!", 2) == 0)
|
|
|
|
{
|
2008-08-07 22:00:53 +02:00
|
|
|
|
|
|
|
/* Header format is OK. */
|
2005-09-15 03:04:05 +02:00
|
|
|
char *executable1;
|
2008-08-07 22:00:53 +02:00
|
|
|
int new_argc;
|
|
|
|
const char **avhere;
|
|
|
|
|
|
|
|
/* Extract interpreter path. */
|
2005-09-15 03:04:05 +02:00
|
|
|
do
|
|
|
|
*eol = '\0';
|
|
|
|
while (*--eol == '\r' || *eol == ' ' || *eol == '\t');
|
|
|
|
for (executable1 = buf + 2; *executable1 == ' ' || *executable1 == '\t'; executable1++)
|
|
|
|
continue;
|
|
|
|
backslashify (executable1);
|
2008-08-07 22:00:53 +02:00
|
|
|
|
|
|
|
/* Duplicate argv, prepending the interpreter path. */
|
|
|
|
new_argc = argv_to_argc (argv) + 1;
|
|
|
|
avhere = XNEWVEC (const char *, new_argc + 1);
|
2005-09-15 03:04:05 +02:00
|
|
|
*avhere = executable1;
|
2008-08-07 22:00:53 +02:00
|
|
|
memcpy (avhere + 1, argv, new_argc * sizeof(*argv));
|
|
|
|
argv = (char *const *)avhere;
|
|
|
|
|
|
|
|
/* Spawn the child. */
|
2005-09-15 03:04:05 +02:00
|
|
|
#ifndef USE_MINGW_MSYS
|
|
|
|
executable = strrchr (executable1, '\\') + 1;
|
|
|
|
if (!executable)
|
|
|
|
executable = executable1;
|
2006-06-01 16:57:50 +02:00
|
|
|
pid = win32_spawn (executable, TRUE, argv, env,
|
2006-04-01 01:01:16 +02:00
|
|
|
dwCreationFlags, si, pi);
|
2005-09-15 03:04:05 +02:00
|
|
|
#else
|
|
|
|
if (strchr (executable1, '\\') == NULL)
|
2006-06-01 16:57:50 +02:00
|
|
|
pid = win32_spawn (executable1, TRUE, argv, env,
|
2006-04-01 01:01:16 +02:00
|
|
|
dwCreationFlags, si, pi);
|
2005-09-15 03:04:05 +02:00
|
|
|
else if (executable1[0] != '\\')
|
2006-06-01 16:57:50 +02:00
|
|
|
pid = win32_spawn (executable1, FALSE, argv, env,
|
2006-04-01 01:01:16 +02:00
|
|
|
dwCreationFlags, si, pi);
|
2005-09-15 03:04:05 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
const char *newex = mingw_rootify (executable1);
|
|
|
|
*avhere = newex;
|
2006-06-01 16:57:50 +02:00
|
|
|
pid = win32_spawn (newex, FALSE, argv, env,
|
2006-04-01 01:01:16 +02:00
|
|
|
dwCreationFlags, si, pi);
|
2005-09-15 03:04:05 +02:00
|
|
|
if (executable1 != newex)
|
|
|
|
free ((char *) newex);
|
2009-04-13 12:48:27 +02:00
|
|
|
if (pid == (pid_t) -1)
|
2005-09-15 03:04:05 +02:00
|
|
|
{
|
|
|
|
newex = msys_rootify (executable1);
|
|
|
|
if (newex != executable1)
|
|
|
|
{
|
|
|
|
*avhere = newex;
|
2006-06-01 16:57:50 +02:00
|
|
|
pid = win32_spawn (newex, FALSE, argv, env,
|
2006-04-01 01:01:16 +02:00
|
|
|
dwCreationFlags, si, pi);
|
2005-09-15 03:04:05 +02:00
|
|
|
free ((char *) newex);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2008-08-07 22:00:53 +02:00
|
|
|
free (avhere);
|
2005-09-15 03:04:05 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-04-13 12:48:27 +02:00
|
|
|
if (pid == (pid_t) -1)
|
2005-09-15 03:04:05 +02:00
|
|
|
errno = save_errno;
|
|
|
|
return pid;
|
|
|
|
}
|
|
|
|
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
/* Execute a child. */
|
|
|
|
|
2007-08-24 18:08:40 +02:00
|
|
|
static pid_t
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
pex_win32_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED, int flags,
|
|
|
|
const char *executable, char * const * argv,
|
2006-06-01 16:57:50 +02:00
|
|
|
char* const* env,
|
2006-08-28 02:56:25 +02:00
|
|
|
int in, int out, int errdes,
|
|
|
|
int toclose ATTRIBUTE_UNUSED,
|
|
|
|
const char **errmsg,
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
int *err)
|
|
|
|
{
|
2007-08-24 18:08:40 +02:00
|
|
|
pid_t pid;
|
2006-04-01 01:01:16 +02:00
|
|
|
HANDLE stdin_handle;
|
|
|
|
HANDLE stdout_handle;
|
|
|
|
HANDLE stderr_handle;
|
|
|
|
DWORD dwCreationFlags;
|
|
|
|
OSVERSIONINFO version_info;
|
|
|
|
STARTUPINFO si;
|
|
|
|
PROCESS_INFORMATION pi;
|
2009-04-29 13:52:41 +02:00
|
|
|
int orig_out, orig_in, orig_err;
|
|
|
|
BOOL separate_stderr = !(flags & PEX_STDERR_TO_STDOUT);
|
|
|
|
|
2012-07-27 02:02:21 +02:00
|
|
|
/* Ensure we have inheritable descriptors to pass to the child. */
|
2009-04-29 13:52:41 +02:00
|
|
|
orig_in = in;
|
|
|
|
in = _dup (orig_in);
|
|
|
|
|
|
|
|
orig_out = out;
|
|
|
|
out = _dup (orig_out);
|
|
|
|
|
|
|
|
if (separate_stderr)
|
|
|
|
{
|
|
|
|
orig_err = errdes;
|
|
|
|
errdes = _dup (orig_err);
|
|
|
|
}
|
2006-04-01 01:01:16 +02:00
|
|
|
|
|
|
|
stdin_handle = INVALID_HANDLE_VALUE;
|
|
|
|
stdout_handle = INVALID_HANDLE_VALUE;
|
|
|
|
stderr_handle = INVALID_HANDLE_VALUE;
|
|
|
|
|
|
|
|
stdin_handle = (HANDLE) _get_osfhandle (in);
|
|
|
|
stdout_handle = (HANDLE) _get_osfhandle (out);
|
2009-04-29 13:52:41 +02:00
|
|
|
if (separate_stderr)
|
2006-04-01 01:01:16 +02:00
|
|
|
stderr_handle = (HANDLE) _get_osfhandle (errdes);
|
|
|
|
else
|
|
|
|
stderr_handle = stdout_handle;
|
|
|
|
|
|
|
|
/* Determine the version of Windows we are running on. */
|
|
|
|
version_info.dwOSVersionInfoSize = sizeof (version_info);
|
|
|
|
GetVersionEx (&version_info);
|
|
|
|
if (version_info.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS)
|
|
|
|
/* On Windows 95/98/ME the CREATE_NO_WINDOW flag is not
|
|
|
|
supported, so we cannot avoid creating a console window. */
|
|
|
|
dwCreationFlags = 0;
|
|
|
|
else
|
2003-01-24 22:31:35 +01:00
|
|
|
{
|
2006-04-01 01:01:16 +02:00
|
|
|
HANDLE conout_handle;
|
|
|
|
|
|
|
|
/* Determine whether or not we have an associated console. */
|
|
|
|
conout_handle = CreateFile("CONOUT$",
|
|
|
|
GENERIC_WRITE,
|
|
|
|
FILE_SHARE_WRITE,
|
|
|
|
/*lpSecurityAttributes=*/NULL,
|
|
|
|
OPEN_EXISTING,
|
|
|
|
FILE_ATTRIBUTE_NORMAL,
|
|
|
|
/*hTemplateFile=*/NULL);
|
|
|
|
if (conout_handle == INVALID_HANDLE_VALUE)
|
|
|
|
/* There is no console associated with this process. Since
|
|
|
|
the child is a console process, the OS would normally
|
|
|
|
create a new console Window for the child. Since we'll be
|
|
|
|
redirecting the child's standard streams, we do not need
|
|
|
|
the console window. */
|
|
|
|
dwCreationFlags = CREATE_NO_WINDOW;
|
|
|
|
else
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
{
|
2006-04-01 01:01:16 +02:00
|
|
|
/* There is a console associated with the process, so the OS
|
|
|
|
will not create a new console. And, if we use
|
|
|
|
CREATE_NO_WINDOW in this situation, the child will have
|
|
|
|
no associated console. Therefore, if the child's
|
|
|
|
standard streams are connected to the console, the output
|
|
|
|
will be discarded. */
|
|
|
|
CloseHandle(conout_handle);
|
|
|
|
dwCreationFlags = 0;
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
}
|
2003-01-24 22:31:35 +01:00
|
|
|
}
|
|
|
|
|
2006-04-01 01:01:16 +02:00
|
|
|
/* Since the child will be a console process, it will, by default,
|
|
|
|
connect standard input/output to its console. However, we want
|
|
|
|
the child to use the handles specifically designated above. In
|
|
|
|
addition, if there is no console (such as when we are running in
|
|
|
|
a Cygwin X window), then we must redirect the child's
|
|
|
|
input/output, as there is no console for the child to use. */
|
|
|
|
memset (&si, 0, sizeof (si));
|
|
|
|
si.cb = sizeof (si);
|
|
|
|
si.dwFlags = STARTF_USESTDHANDLES;
|
|
|
|
si.hStdInput = stdin_handle;
|
|
|
|
si.hStdOutput = stdout_handle;
|
|
|
|
si.hStdError = stderr_handle;
|
|
|
|
|
|
|
|
/* Create the child process. */
|
|
|
|
pid = win32_spawn (executable, (flags & PEX_SEARCH) != 0,
|
2006-06-01 16:57:50 +02:00
|
|
|
argv, env, dwCreationFlags, &si, &pi);
|
2007-08-24 18:08:40 +02:00
|
|
|
if (pid == (pid_t) -1)
|
2006-06-01 16:57:50 +02:00
|
|
|
pid = spawn_script (executable, argv, env, dwCreationFlags,
|
|
|
|
&si, &pi);
|
2007-08-24 18:08:40 +02:00
|
|
|
if (pid == (pid_t) -1)
|
2003-01-24 22:31:35 +01:00
|
|
|
{
|
2006-04-01 01:01:16 +02:00
|
|
|
*err = ENOENT;
|
|
|
|
*errmsg = "CreateProcess";
|
2003-01-24 22:31:35 +01:00
|
|
|
}
|
|
|
|
|
2012-07-27 02:02:21 +02:00
|
|
|
/* If the child was created successfully, close the original file
|
|
|
|
descriptors. If the process creation fails, these are closed by
|
|
|
|
pex_run_in_environment instead. We must not close them twice as
|
|
|
|
that seems to cause a Windows exception. */
|
|
|
|
|
|
|
|
if (pid != (pid_t) -1)
|
|
|
|
{
|
|
|
|
if (orig_in != STDIN_FILENO)
|
|
|
|
_close (orig_in);
|
|
|
|
if (orig_out != STDOUT_FILENO)
|
|
|
|
_close (orig_out);
|
|
|
|
if (separate_stderr
|
|
|
|
&& orig_err != STDERR_FILENO)
|
|
|
|
_close (orig_err);
|
|
|
|
}
|
|
|
|
|
2009-04-29 13:52:41 +02:00
|
|
|
/* Close the standard input, standard output and standard error handles
|
|
|
|
in the parent. */
|
|
|
|
|
2009-05-17 15:12:28 +02:00
|
|
|
_close (in);
|
|
|
|
_close (out);
|
|
|
|
if (separate_stderr)
|
2009-04-29 13:52:41 +02:00
|
|
|
_close (errdes);
|
2003-01-24 22:31:35 +01:00
|
|
|
|
|
|
|
return pid;
|
|
|
|
}
|
|
|
|
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
/* Wait for a child process to complete. MS CRTDLL doesn't return
|
|
|
|
enough information in status to decide if the child exited due to a
|
|
|
|
signal or not, rather it simply returns an integer with the exit
|
|
|
|
code of the child; eg., if the child exited with an abort() call
|
|
|
|
and didn't have a handler for SIGABRT, it simply returns with
|
|
|
|
status == 3. We fix the status code to conform to the usual WIF*
|
|
|
|
macros. Note that WIFSIGNALED will never be true under CRTDLL. */
|
|
|
|
|
2009-04-13 12:48:27 +02:00
|
|
|
static pid_t
|
2007-08-24 18:08:40 +02:00
|
|
|
pex_win32_wait (struct pex_obj *obj ATTRIBUTE_UNUSED, pid_t pid,
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
int *status, struct pex_time *time, int done ATTRIBUTE_UNUSED,
|
|
|
|
const char **errmsg, int *err)
|
2003-01-24 22:31:35 +01:00
|
|
|
{
|
2006-04-01 01:01:16 +02:00
|
|
|
DWORD termstat;
|
|
|
|
HANDLE h;
|
2003-01-24 22:31:35 +01:00
|
|
|
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
if (time != NULL)
|
|
|
|
memset (time, 0, sizeof *time);
|
|
|
|
|
2006-04-01 01:01:16 +02:00
|
|
|
h = (HANDLE) pid;
|
|
|
|
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
/* FIXME: If done is non-zero, we should probably try to kill the
|
|
|
|
process. */
|
2006-04-01 01:01:16 +02:00
|
|
|
if (WaitForSingleObject (h, INFINITE) != WAIT_OBJECT_0)
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
{
|
2006-04-01 01:01:16 +02:00
|
|
|
CloseHandle (h);
|
|
|
|
*err = ECHILD;
|
|
|
|
*errmsg = "WaitForSingleObject";
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2003-01-24 22:31:35 +01:00
|
|
|
|
2006-04-01 01:01:16 +02:00
|
|
|
GetExitCodeProcess (h, &termstat);
|
|
|
|
CloseHandle (h);
|
|
|
|
|
|
|
|
/* A value of 3 indicates that the child caught a signal, but not
|
|
|
|
which one. Since only SIGABRT, SIGFPE and SIGINT do anything, we
|
|
|
|
report SIGABRT. */
|
2003-01-24 22:31:35 +01:00
|
|
|
if (termstat == 3)
|
|
|
|
*status = SIGABRT;
|
|
|
|
else
|
2006-04-01 01:01:16 +02:00
|
|
|
*status = (termstat & 0xff) << 8;
|
2003-01-24 22:31:35 +01:00
|
|
|
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create a pipe. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
pex_win32_pipe (struct pex_obj *obj ATTRIBUTE_UNUSED, int *p,
|
|
|
|
int binary)
|
|
|
|
{
|
2009-04-29 13:52:41 +02:00
|
|
|
return _pipe (p, 256, (binary ? _O_BINARY : _O_TEXT) | _O_NOINHERIT);
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Get a FILE pointer to read from a file descriptor. */
|
|
|
|
|
|
|
|
static FILE *
|
|
|
|
pex_win32_fdopenr (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd,
|
|
|
|
int binary)
|
|
|
|
{
|
2009-05-29 22:19:14 +02:00
|
|
|
HANDLE h = (HANDLE) _get_osfhandle (fd);
|
|
|
|
if (h == INVALID_HANDLE_VALUE)
|
|
|
|
return NULL;
|
|
|
|
if (! SetHandleInformation (h, HANDLE_FLAG_INHERIT, 0))
|
|
|
|
return NULL;
|
libiberty:
* pex-common.c: New file.
* pex-one.c: New file.
* pexecute.c: New file.
* pex-common.h: Include <stdio.h>.
(struct pex_obj): Define.
(struct pex_funcs): Define.
(pex_init_common): Declare.
* pex-unix.c: Rewrite.
* pex-win32.c: Rewrite.
* pex-djgpp.c: Rewrite.
* pex-msdos.c: Rewrite.
* testsuite/text-pexecute.c: New file.
* pexecute.txh: Rewrite.
* configure.ac: Check for wait3 and wait4. Set CHECK to
really-check rather than check-cplus-dem.
* functions.texi: Rebuild.
* Makefile.in: Rebuild dependencies.
(CFILES): Add pexecute.c, pex-common.c, pex-one.c.
(REQUIRED_OFILES): Add pexecute.o, pex-common.o, pex-one.o.
* testsuite/Makefile.in (really-check): New target.
(check-pexecute, test-pexecute): New targets.
* configure: Rebuild.
include:
* libiberty.h: Include <stdio.h>.
(PEX_RECORD_TIMES, PEX_USE_PIPES, PEX_SAVE_TEMPS): Define.
(PEX_LAST, PEX_SEARCH, PEX_SUFFIX, PEX_STDERR_TO_STDOUT): Define.
(PEX_BINARY_INPUT, PEX_BINARY_OUTPUT): Define.
(pex_init, pex_run, pex_read_output): Declare.
(pex_get_status, pex_get_times, pex_free, pex_one): Declare.
(struct pex_time): Define.
2005-03-29 04:15:24 +02:00
|
|
|
return fdopen (fd, binary ? "rb" : "r");
|
2003-01-24 22:31:35 +01:00
|
|
|
}
|
2005-09-15 03:04:05 +02:00
|
|
|
|
2006-04-12 20:42:01 +02:00
|
|
|
static FILE *
|
|
|
|
pex_win32_fdopenw (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd,
|
|
|
|
int binary)
|
|
|
|
{
|
|
|
|
HANDLE h = (HANDLE) _get_osfhandle (fd);
|
|
|
|
if (h == INVALID_HANDLE_VALUE)
|
|
|
|
return NULL;
|
|
|
|
if (! SetHandleInformation (h, HANDLE_FLAG_INHERIT, 0))
|
|
|
|
return NULL;
|
|
|
|
return fdopen (fd, binary ? "wb" : "w");
|
|
|
|
}
|
|
|
|
|
2005-09-15 03:04:05 +02:00
|
|
|
#ifdef MAIN
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
int
|
|
|
|
main (int argc ATTRIBUTE_UNUSED, char **argv)
|
|
|
|
{
|
|
|
|
char const *errmsg;
|
|
|
|
int err;
|
|
|
|
argv++;
|
2007-08-24 18:08:40 +02:00
|
|
|
printf ("%ld\n", (long) pex_win32_exec_child (NULL, PEX_SEARCH, argv[0], argv, NULL, 0, 0, 1, 2, &errmsg, &err));
|
2005-09-15 03:04:05 +02:00
|
|
|
exit (0);
|
|
|
|
}
|
|
|
|
#endif
|