S/390: Fix uc_link == NULL handling for makecontext

[platform/upstream/glibc.git] / posix / execle.c

diff --git a/posix/execle.c b/posix/execle.c
index 7619a36..2447c59 100644 (file)
--- a/posix/execle.c
+++ b/posix/execle.c
@@ -1,67 +1,72 @@
-/* Copyright (C) 1991, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,97,98,99,2002,2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library 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.
+   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.
 
    The GNU C 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
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
 
-#include <alloca.h>
 #include <unistd.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <string.h>
 
+#include <stackinfo.h>
+
 /* Execute PATH with all arguments after PATH until a NULL pointer,
    and the argument after that for environment.  */
 int
 execle (const char *path, const char *arg, ...)
 {
-  size_t argv_max = 1024;
-  const char **argv = alloca (argv_max * sizeof (const char *));
-  const char *const *envp;
-  unsigned int i;
+#define INITIAL_ARGV_MAX 1024
+  size_t argv_max = INITIAL_ARGV_MAX;
+  const char *initial_argv[INITIAL_ARGV_MAX];
+  const char **argv = initial_argv;
   va_list args;
   argv[0] = arg;
 
-  va_start(args, arg);
-  i = 1;
-  do
+  va_start (args, arg);
+  unsigned int i = 0;
+  while (argv[i++] != NULL)
     {
       if (i == argv_max)
        {
-         const char **nptr = alloca ((argv_max *= 2) * sizeof (const char *));
-
-         if ((char *) nptr + argv_max == (char *) argv)
+         argv_max *= 2;
+         const char **nptr = realloc (argv == initial_argv ? NULL : argv,
+                                      argv_max * sizeof (const char *));
+         if (nptr == NULL)
            {
-             /* Stack grows down.  */
-             argv = (const char **) memcpy (nptr, argv, i);
-             argv_max += i;
+             if (argv != initial_argv)
+               free (argv);
+             return -1;
            }
-         else if ((char *) argv + i == (char *) nptr)
-           /* Stack grows up.  */
-           argv_max += i;
-         else
-           /* We have a hole in the stack.  */
-           argv = (const char **) memcpy (nptr, argv, i);
+         if (argv == initial_argv)
+           /* We have to copy the already filled-in data ourselves.  */
+           memcpy (nptr, argv, i * sizeof (const char *));
+
+         argv = nptr;
        }
 
       argv[i] = va_arg (args, const char *);
     }
-  while (argv[i++] != NULL);
 
-  envp = va_arg(args, const char *const *);
-  va_end(args);
+  const char *const *envp = va_arg (args, const char *const *);
+  va_end (args);
+
+  int ret = __execve (path, (char *const *) argv, (char *const *) envp);
+  if (argv != initial_argv)
+    free (argv);
 
-  return __execve(path, (char *const *) argv, (char *const *) envp);
+  return ret;
 }
+libc_hidden_def (execle)