summaryrefslogtreecommitdiff
path: root/posix/execlp.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
committerUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
commita334319f6530564d22e775935d9c91663623a1b4 (patch)
treeb5877475619e4c938e98757d518bb1e9cbead751 /posix/execlp.c
parent0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (diff)
downloadglibc-a334319f6530564d22e775935d9c91663623a1b4.tar.gz
(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.
Diffstat (limited to 'posix/execlp.c')
-rw-r--r--posix/execlp.c50
1 files changed, 26 insertions, 24 deletions
diff --git a/posix/execlp.c b/posix/execlp.c
index 66996a9367..ba8fc74c90 100644
--- a/posix/execlp.c
+++ b/posix/execlp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,93,96,97,98,99,2002,2005 Free Software Foundation, Inc.
+/* Copyright (C) 1991,93,96,97,98,99,2002 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
@@ -16,10 +16,10 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#include <alloca.h>
#include <unistd.h>
#include <stdarg.h>
#include <stddef.h>
-#include <stdlib.h>
#include <string.h>
#include <stackinfo.h>
@@ -30,44 +30,46 @@
int
execlp (const char *file, const char *arg, ...)
{
-#define INITIAL_ARGV_MAX 1024
- size_t argv_max = INITIAL_ARGV_MAX;
- const char *initial_argv[INITIAL_ARGV_MAX];
- const char **argv = initial_argv;
+ size_t argv_max = 1024;
+ const char **argv = alloca (argv_max * sizeof (const char *));
+ unsigned int i;
va_list args;
argv[0] = arg;
va_start (args, arg);
- unsigned int i = 0;
+ i = 0;
while (argv[i++] != NULL)
{
if (i == argv_max)
{
- argv_max *= 2;
- const char **nptr = realloc (argv == initial_argv ? NULL : argv,
- argv_max * sizeof (const char *));
- if (nptr == NULL)
+ const char **nptr = alloca ((argv_max *= 2) * sizeof (const char *));
+
+#ifndef _STACK_GROWS_UP
+ if ((char *) nptr + argv_max == (char *) argv)
{
- if (argv != initial_argv)
- free (argv);
- return -1;
+ /* Stack grows down. */
+ argv = (const char **) memcpy (nptr, argv,
+ i * sizeof (const char *));
+ argv_max += i;
}
- if (argv == initial_argv)
- /* We have to copy the already filled-in data ourselves. */
- memcpy (nptr, argv, i * sizeof (const char *));
-
- argv = nptr;
+ else
+#endif
+#ifndef _STACK_GROWS_DOWN
+ if ((char *) argv + i == (char *) nptr)
+ /* Stack grows up. */
+ argv_max += i;
+ else
+#endif
+ /* We have a hole in the stack. */
+ argv = (const char **) memcpy (nptr, argv,
+ i * sizeof (const char *));
}
argv[i] = va_arg (args, const char *);
}
va_end (args);
- int ret = execvp (file, (char *const *) argv);
- if (argv != initial_argv)
- free (argv);
-
- return ret;
+ return execvp (file, (char *const *) argv);
}
libc_hidden_def (execlp)