From 31824f5b53b3d75de64260e084c7db27c31dd45d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 15 Sep 2014 10:17:04 -0600 Subject: [PATCH] execl() is not a system interface. It belongs in libc and should not have a system call associated with it. --- include/sys/syscall.h | 3 +-- syscall/syscall.csv | 1 - syscall/syscall_lookup.h | 1 - syscall/syscall_stublookup.c | 3 --- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/sys/syscall.h b/include/sys/syscall.h index 6c936b04f9..3ec10b3cd0 100644 --- a/include/sys/syscall.h +++ b/include/sys/syscall.h @@ -161,8 +161,7 @@ # define SYS_posix_spawn __SYS_posix_spawn # endif # define SYS_execv (__SYS_posix_spawn+1) -# define SYS_execl (__SYS_posix_spawn+2) -# define __SYS_signals (__SYS_posix_spawn+3) +# define __SYS_signals (__SYS_posix_spawn+2) #else # define __SYS_signals __SYS_posix_spawn #endif diff --git a/syscall/syscall.csv b/syscall/syscall.csv index b30729790c..073f9d1d91 100644 --- a/syscall/syscall.csv +++ b/syscall/syscall.csv @@ -12,7 +12,6 @@ "connect","sys/socket.h","CONFIG_NSOCKET_DESCRIPTORS > 0 && defined(CONFIG_NET)","int","int","FAR const struct sockaddr*","socklen_t" "dup","unistd.h","CONFIG_NFILE_DESCRIPTORS > 0","int","int" "dup2","unistd.h","CONFIG_NFILE_DESCRIPTORS > 0","int","int","int" -"execl","unistd.h","!defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS)","int","FAR const char *","..." "execv","unistd.h","!defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS)","int","FAR const char *","FAR char *const []|FAR char *const *" "exit","stdlib.h","","void","int" "fcntl","fcntl.h","CONFIG_NFILE_DESCRIPTORS > 0","int","int","int","..." diff --git a/syscall/syscall_lookup.h b/syscall/syscall_lookup.h index a85a6a0989..f4779fe2a1 100644 --- a/syscall/syscall_lookup.h +++ b/syscall/syscall_lookup.h @@ -107,7 +107,6 @@ SYSCALL_LOOKUP(up_assert, 2, STUB_up_assert) SYSCALL_LOOKUP(posix_spawn, 6, STUB_posix_spawn) # endif SYSCALL_LOOKUP(execv, 2, STUB_execv) - SYSCALL_LOOKUP(execl, 6, STUB_execl) #endif /* The following are only defined is signals are supported in the NuttX diff --git a/syscall/syscall_stublookup.c b/syscall/syscall_stublookup.c index bcd1772f72..9776836035 100644 --- a/syscall/syscall_stublookup.c +++ b/syscall/syscall_stublookup.c @@ -114,9 +114,6 @@ uintptr_t STUB_posix_spawnp(int nbr, uintptr_t parm1, uintptr_t parm2, uintptr_t parm3, uintptr_t parm4, uintptr_t parm5, uintptr_t parm6); uintptr_t STUB_execv(int nbr, uintptr_t parm1, uintptr_t parm2); -uintptr_t STUB_execl(int nbr, uintptr_t parm1, uintptr_t parm2, - uintptr_t parm3, uintptr_t parm4, uintptr_t parm5, - uintptr_t parm6); /* The following are only defined is signals are supported in the NuttX * configuration.