From 6f24cca893d475106749cedaa10c0bcf70a6a746 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 12 Sep 2014 12:47:20 -0600 Subject: exevc, execvl, posix_spawn, and posix_spawnp were not properly integrated as system calls. --- nuttx/include/sys/syscall.h | 20 ++++++++++---------- nuttx/syscall/syscall.csv | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/nuttx/include/sys/syscall.h b/nuttx/include/sys/syscall.h index 13b193045..6c936b04f 100644 --- a/nuttx/include/sys/syscall.h +++ b/nuttx/include/sys/syscall.h @@ -142,29 +142,29 @@ # ifdef CONFIG_SCHED_HAVE_PARENT # define SYS_wait (__SYS_waitpid+1) # define SYS_waitid (__SYS_waitpid+2) -# define __SYS_posixspawn (__SYS_waitpid+3) +# define __SYS_posix_spawn (__SYS_waitpid+3) # else -# define __SYS_posixspawn (__SYS_waitpid+1) +# define __SYS_posix_spawn (__SYS_waitpid+1) #endif #else -# define __SYS_posixspawn __SYS_waitpid +# define __SYS_posix_spawn __SYS_waitpid #endif /* The following can only be defined if we are configured to execute * programs from a file system. */ -#if defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS) +#if !defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS) # ifdef CONFIG_BINFMT_EXEPATH -# define SYS_posixspawnp __SYS_posixspawn +# define SYS_posix_spawnp __SYS_posix_spawn # else -# define SYS_posixspawn __SYS_posixspawn +# define SYS_posix_spawn __SYS_posix_spawn # endif -# define SYS_execv (__SYS_posixspawn+1) -# define SYS_execl (__SYS_posixspawn+2) -# define __SYS_signals (__SYS_posixspawn+3) +# define SYS_execv (__SYS_posix_spawn+1) +# define SYS_execl (__SYS_posix_spawn+2) +# define __SYS_signals (__SYS_posix_spawn+3) #else -# define __SYS_signals __SYS_posixspawn +# define __SYS_signals __SYS_posix_spawn #endif /* The following are only defined is signals are supported in the NuttX diff --git a/nuttx/syscall/syscall.csv b/nuttx/syscall/syscall.csv index 226c0776e..b30729790 100644 --- a/nuttx/syscall/syscall.csv +++ b/nuttx/syscall/syscall.csv @@ -12,8 +12,8 @@ "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 *path","..." -"execv","unistd.h","!defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS)","int","FAR const char *path","FAR char *const argv[]" +"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","..." "fs_fdopen","nuttx/fs/fs.h","CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0","FAR struct file_struct*","int","int","FAR struct tcb_s*" @@ -47,8 +47,8 @@ "pipe","unistd.h","CONFIG_NFILE_DESCRIPTORS > 0","int","int [2]|int*" "poll","poll.h","!defined(CONFIG_DISABLE_POLL) && (CONFIG_NSOCKET_DESCRIPTORS > 0 || CONFIG_NFILE_DESCRIPTORS > 0)","int","FAR struct pollfd*","nfds_t","int" "prctl","sys/prctl.h", "CONFIG_TASK_NAME_SIZE > 0","int","int","..." -"posix_spawnp","spawn.h","!defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS) && defined(CONFIG_BINFMT_EXEPATH)","int","FAR pid_t *","FAR const char *","FAR const posix_spawn_file_actions_t *","FAR const posix_spawnattr_t *","FAR char *const []","FAR char *const []" -"posix_spawn","spawn.h","!defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS) && !defined(CONFIG_BINFMT_EXEPATH)","int","FAR pid_t *","FAR const char *","FAR const posix_spawn_file_actions_t *","FAR const posix_spawnattr_t *","FAR char *const []","FAR char *const []" +"posix_spawnp","spawn.h","!defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS) && defined(CONFIG_BINFMT_EXEPATH)","int","FAR pid_t *","FAR const char *","FAR const posix_spawn_file_actions_t *","FAR const posix_spawnattr_t *","FAR char *const []|FAR char *const *","FAR char *const []" +"posix_spawn","spawn.h","!defined(CONFIG_BINFMT_DISABLE) && defined(CONFIG_LIBC_EXECFUNCS) && !defined(CONFIG_BINFMT_EXEPATH)","int","FAR pid_t *","FAR const char *","FAR const posix_spawn_file_actions_t *","FAR const posix_spawnattr_t *","FAR char *const []|FAR char *const *","FAR char *const []|FAR char *const *" "pthread_barrier_destroy","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR pthread_barrier_t*" "pthread_barrier_init","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR pthread_barrier_t*","FAR const pthread_barrierattr_t*","unsigned int" "pthread_barrier_wait","pthread.h","!defined(CONFIG_DISABLE_PTHREAD)","int","FAR pthread_barrier_t*" -- cgit v1.2.3