Commit 8d3bc5c8 authored by Alexandre Julliard's avatar Alexandre Julliard

libport: Remove the _spawnvp() implementation.

parent 6052dbd7
......@@ -17896,7 +17896,6 @@ CFLAGS="$CFLAGS $BUILTINFLAG"
for ac_func in \
__res_get_state \
__res_getservers \
_spawnvp \
epoll_create \
fork \
fstatfs \
......
......@@ -2127,7 +2127,6 @@ CFLAGS="$CFLAGS $BUILTINFLAG"
AC_CHECK_FUNCS(\
__res_get_state \
__res_getservers \
_spawnvp \
epoll_create \
fork \
fstatfs \
......
......@@ -965,9 +965,6 @@
/* Define if Xrandr has the XRRGetProviderResources function */
#undef HAVE_XRRGETPROVIDERRESOURCES
/* Define to 1 if you have the `_spawnvp' function. */
#undef HAVE__SPAWNVP
/* Define to 1 if you have the `__builtin_popcount' built-in function. */
#undef HAVE___BUILTIN_POPCOUNT
......
......@@ -92,18 +92,6 @@ typedef int ssize_t;
# endif
#endif
/* Process creation flags */
#ifndef _P_WAIT
# define _P_WAIT 0
# define _P_NOWAIT 1
# define _P_OVERLAY 2
# define _P_NOWAITO 3
# define _P_DETACH 4
#endif
#ifndef HAVE__SPAWNVP
extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]);
#endif
#endif /* _WIN32 */
/****************************************************************
......
......@@ -3,5 +3,4 @@ STATICLIB = libwine_port.a
C_SRCS = \
lstat.c \
readlink.c \
spawn.c \
symlink.c
/*
* spawnvp function
*
* Copyright 2003 Dimitrie O. Paun
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include "wine/port.h"
#if !defined(HAVE__SPAWNVP) && (!defined(_WIN32) || defined(__CYGWIN__))
#include <errno.h>
#include <signal.h>
#include <stdlib.h>
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
int _spawnvp(int mode, const char *cmdname, const char *const argv[])
{
int pid, status, wret;
if (mode == _P_OVERLAY)
{
execvp(cmdname, (char **)argv);
/* if we get here it failed */
#ifdef ENOTSUP
if (errno != ENOTSUP) /* exec fails on MacOS if the process has multiple threads */
#endif
return -1;
}
pid = fork();
if (pid == 0)
{
/* in child */
if (mode == _P_DETACH)
{
pid = fork();
if (pid == -1) _exit(1);
else if (pid > 0) _exit(0);
/* else in grandchild */
}
signal( SIGPIPE, SIG_DFL );
execvp(cmdname, (char **)argv);
_exit(1);
}
if (pid == -1)
return -1;
if (mode == _P_OVERLAY) exit(0);
if (mode == _P_WAIT || mode == _P_DETACH)
{
while (pid != (wret = waitpid(pid, &status, 0)))
if (wret == -1 && errno != EINTR) break;
if (pid == wret && WIFEXITED(status))
{
if (mode == _P_WAIT)
pid = WEXITSTATUS(status);
else /* mode == _P_DETACH */
if (WEXITSTATUS(status) != 0) /* child couldn't fork grandchild */
pid = -1;
}
else
{
if (mode == _P_WAIT)
pid = 255; /* abnormal exit with an abort or an interrupt */
else /* mode == _P_DETACH */
pid = -1;
}
}
return pid;
}
#endif /* HAVE__SPAWNVP */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment