1 files changed, 20 insertions, 132 deletions

diff --git a/winsup/cygwin/exec.cc b/winsup/cygwin/exec.cc
index 228aa69b0..942b79d83 100644
--- a/winsup/cygwin/exec.cc
+++ b/winsup/cygwin/exec.cc
@@ -1,6 +1,6 @@
 /* exec.cc: exec system call support.
 
-   Copyright 1996, 1997, 1998, 2000, 2001 Red Hat, Inc.
+   Copyright 1996, 1997, 1998, 2000, 2001, 2002 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -17,27 +17,24 @@ details. */
 #include "security.h"
 #include "fhandler.h"
 #include "path.h"
-#include "sync.h"
-#include "sigproc.h"
 #include "pinfo.h"
 #include "environ.h"
+#include "cygerrno.h"
 
 /* This is called _execve and not execve because the real execve is defined
    in libc/posix/execve.c.  It calls us.  */
 
-extern "C"
-int
+extern "C" int
 _execve (const char *path, char *const argv[], char *const envp[])
 {
   static char *const empty_env[] = { 0 };
   MALLOC_CHECK;
   if (!envp)
     envp = empty_env;
-  return _spawnve (NULL, _P_OVERLAY, path, argv, envp);
+  return spawnve (_P_OVERLAY, path, argv, envp);
 }
 
-extern "C"
-int
+extern "C" int
 execl (const char *path, const char *arg0, ...)
 {
   int i;
@@ -55,131 +52,18 @@ execl (const char *path, const char *arg0, ...)
   return _execve (path, (char * const  *) argv, cur_environ ());
 }
 
-extern "C"
-int
+extern "C" int
 execv (const char *path, char * const *argv)
 {
   MALLOC_CHECK;
   return _execve (path, (char * const *) argv, cur_environ ());
 }
 
-/* the same as a standard exec() calls family, but with NT security support */
-
-extern "C"
-pid_t
-sexecve (HANDLE hToken, const char *path, const char *const argv[],
-	 const char *const envp[])
-{
-  _spawnve (hToken, _P_OVERLAY, path, argv, envp);
-  return -1;
-}
-
-extern "C"
-int
-sexecl (HANDLE hToken, const char *path, const char *arg0, ...)
-{
-  int i;
-  va_list args;
-  const char *argv[1024];
-
-  va_start (args, arg0);
-  argv[0] = arg0;
-  i = 1;
-
-  do
-      argv[i] = va_arg (args, const char *);
-  while (argv[i++] != NULL);
-
-  va_end (args);
-
-  MALLOC_CHECK;
-  return sexecve (hToken, path, (char * const *) argv, cur_environ ());
-}
-
-extern "C"
-int
-sexecle (HANDLE hToken, const char *path, const char *arg0, ...)
-{
-  int i;
-  va_list args;
-  const char * const *envp;
-  const char *argv[1024];
-
-  va_start (args, arg0);
-  argv[0] = arg0;
-  i = 1;
-
-  do
-    argv[i] = va_arg (args, const char *);
-  while (argv[i++] != NULL);
-
-  envp = va_arg (args, const char * const *);
-  va_end (args);
-
-  MALLOC_CHECK;
-  return sexecve(hToken, path, (char * const *) argv, (char * const *) envp);
-}
-
-extern "C"
-int
-sexeclp (HANDLE hToken, const char *path, const char *arg0, ...)
-{
-  int i;
-  va_list args;
-  const char *argv[1024];
-
-  va_start (args, arg0);
-  argv[0] = arg0;
-  i = 1;
-
-  do
-      argv[i] = va_arg (args, const char *);
-  while (argv[i++] != NULL);
-
-  va_end (args);
-
-  MALLOC_CHECK;
-  return sexecvpe (hToken, path, (const char * const *) argv, cur_environ ());
-}
-
-extern "C"
-int
-sexeclpe (HANDLE hToken, const char *path, const char *arg0, ...)
-{
-  int i;
-  va_list args;
-  const char * const *envp;
-  const char *argv[1024];
-
-  va_start (args, arg0);
-  argv[0] = arg0;
-  i = 1;
-
-  do
-    argv[i] = va_arg (args, const char *);
-  while (argv[i++] != NULL);
-
-  envp = va_arg (args, const char * const *);
-  va_end (args);
-
-  MALLOC_CHECK;
-  return sexecvpe (hToken, path, argv, envp);
-}
-
-extern "C"
-int
-sexecv (HANDLE hToken, const char *path, const char * const *argv)
+extern "C" pid_t
+sexecve_is_bad ()
 {
-  MALLOC_CHECK;
-  return sexecve (hToken, path, argv, cur_environ ());
-}
-
-extern "C"
-int
-sexecp (HANDLE hToken, const char *path, const char * const *argv)
-{
-  MALLOC_CHECK;
-  return sexecvpe (hToken, path, argv, cur_environ ());
+  set_errno (ENOSYS);
+  return 0;
 }
 
 /*
@@ -199,12 +83,16 @@ strccpy (char *s1, const char **s2, char c)
   return s1;
 }
 
-extern "C"
-int
-sexecvpe (HANDLE hToken, const char *file, const char * const *argv,
-	  const char *const *envp)
+extern "C" int
+execvp (const char *path, char * const *argv)
 {
   path_conv buf;
-  MALLOC_CHECK;
-  return sexecve (hToken, find_exec (file, buf), argv, envp);
+  return  execv (find_exec (path, buf), argv);
+}
+
+extern "C" int
+execvpe (const char *path, char * const *argv, char *const *envp)
+{
+  path_conv buf;
+  return  execve (find_exec (path, buf), argv, envp);
 }