aboutsummaryrefslogtreecommitdiff
path: root/posix/execl.c
diff options
context:
space:
mode:
Diffstat (limited to 'posix/execl.c')
-rw-r--r--posix/execl.c64
1 files changed, 42 insertions, 22 deletions
diff --git a/posix/execl.c b/posix/execl.c
index 9aa13b958f..4772f15474 100644
--- a/posix/execl.c
+++ b/posix/execl.c
@@ -1,37 +1,38 @@
-/* Copyright (C) 1991, 1992, 1994 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+/* Copyright (C) 1991, 1992, 1994, 1997 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.
+ 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.
-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.
+ 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.
-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., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+ 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. */
-#include <ansidecl.h>
#include <unistd.h>
#include <stdarg.h>
#include <stddef.h>
+#include <string.h>
#ifndef HAVE_GNU_LD
-#define __environ environ
+# define __environ environ
#endif
/* Execute PATH with all arguments after PATH until
a NULL pointer and environment from `environ'. */
int
-DEFUN(execl, (path, arg), CONST char *path AND CONST char *arg DOTS)
+execl (const char *path, const char *arg, ...)
{
- CONST char *argv[1024];
- register unsigned int i;
+ size_t argv_max = 1024;
+ const char **argv = alloca (argv_max * sizeof (const char *));
+ unsigned int i;
va_list args;
argv[0] = arg;
@@ -40,9 +41,28 @@ DEFUN(execl, (path, arg), CONST char *path AND CONST char *arg DOTS)
i = 1;
do
{
- argv[i] = va_arg (args, CONST char *);
- } 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)
+ {
+ /* Stack grows down. */
+ argv = (const char **) memcpy (nptr, argv, i);
+ argv_max += i;
+ }
+ 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);
+ }
+
+ argv[i] = va_arg (args, const char *);
+ }
+ while (argv[i++] != NULL);
va_end (args);
- return __execve (path, (char *CONST *) argv, __environ);
+ return __execve (path, (char *const *) argv, __environ);
}