diff options
author | Joseph Myers <joseph@codesourcery.com> | 2013-02-04 16:29:39 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2013-02-04 16:29:39 +0000 |
commit | 6277fdabc074afa76ad5883a4b99cdf8e75de31a (patch) | |
tree | 493a561e4b45b33ca2ead8f26137f857f07611b1 /sysdeps/unix/sysv/linux/execve.c | |
parent | 903ae060db90aa1d72aa67afbc5a5ecabdcdbef7 (diff) | |
download | glibc-6277fdabc074afa76ad5883a4b99cdf8e75de31a.zip glibc-6277fdabc074afa76ad5883a4b99cdf8e75de31a.tar.gz glibc-6277fdabc074afa76ad5883a4b99cdf8e75de31a.tar.bz2 |
Remove CHECK_STRING, CHECK_STRING_NULL_OK and __ubp_memchr.
Diffstat (limited to 'sysdeps/unix/sysv/linux/execve.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/execve.c | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/sysdeps/unix/sysv/linux/execve.c b/sysdeps/unix/sysv/linux/execve.c index 4aae3b4..5ee5ecb 100644 --- a/sysdeps/unix/sysv/linux/execve.c +++ b/sysdeps/unix/sysv/linux/execve.c @@ -21,7 +21,8 @@ #include <sysdep.h> #include <alloca.h> #include <sys/syscall.h> -#include <bp-checks.h> + +/* Consider moving to syscalls.list. */ int __execve (file, argv, envp) @@ -29,34 +30,6 @@ __execve (file, argv, envp) char *const argv[]; char *const envp[]; { -#if __BOUNDED_POINTERS__ - { - char *const *v; - int i; - char *__unbounded *__unbounded ubp_argv; - char *__unbounded *__unbounded ubp_envp; - char *__unbounded *__unbounded ubp_v; - - for (v = argv; *v; v++) - ; - i = v - argv + 1; - ubp_argv = (char *__unbounded *__unbounded) alloca (sizeof (*ubp_argv) * i); - for (v = argv, ubp_v = ubp_argv; --i; v++, ubp_v++) - *ubp_v = CHECK_STRING (*v); - *ubp_v = 0; - - for (v = envp; *v; v++) - ; - i = v - envp + 1; - ubp_envp = (char *__unbounded *__unbounded) alloca (sizeof (*ubp_envp) * i); - for (v = envp, ubp_v = ubp_envp; --i; v++, ubp_v++) - *ubp_v = CHECK_STRING (*v); - *ubp_v = 0; - - return INLINE_SYSCALL (execve, 3, CHECK_STRING (file), ubp_argv, ubp_envp); - } -#else return INLINE_SYSCALL (execve, 3, file, argv, envp); -#endif } weak_alias (__execve, execve) |