diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-12 17:09:18 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-12 17:09:18 -0600 |
| commit | c5706e59a0621fbf9256c0a47a70b08359352aa7 (patch) | |
| tree | c89d05e853441bf1daf62a49e1217c3bd22ccc1a | |
| parent | 738d21f532f77a961ea8832a92397420618367b3 (diff) | |
| download | nuttx-c5706e59a0621fbf9256c0a47a70b08359352aa7.tar.gz nuttx-c5706e59a0621fbf9256c0a47a70b08359352aa7.tar.bz2 nuttx-c5706e59a0621fbf9256c0a47a70b08359352aa7.zip | |
Fix more errors associated with posix_spawn system calls
| -rw-r--r-- | apps/nshlib/nsh_console.c | 1 | ||||
| -rw-r--r-- | apps/nshlib/nsh_consolemain.c | 2 | ||||
| -rw-r--r-- | nuttx/syscall/syscall_lookup.h | 6 |
3 files changed, 5 insertions, 4 deletions
diff --git a/apps/nshlib/nsh_console.c b/apps/nshlib/nsh_console.c index 9b78258c4..0910f76f1 100644 --- a/apps/nshlib/nsh_console.c +++ b/apps/nshlib/nsh_console.c @@ -487,5 +487,6 @@ FAR struct console_stdio_s *nsh_newconsole(void) pstate->cn_outstream = OUTSTREAM(pstate); #endif } + return pstate; } diff --git a/apps/nshlib/nsh_consolemain.c b/apps/nshlib/nsh_consolemain.c index a8e7bd72a..ec3f1c673 100644 --- a/apps/nshlib/nsh_consolemain.c +++ b/apps/nshlib/nsh_consolemain.c @@ -94,7 +94,7 @@ * Returned Values: * This function does not normally return. exit() is usually called to * terminate the NSH session. This function will return in the event of - * an error. In that case, a nonzero value is returned (EXIT_FAILURE=1). + * an error. In that case, a non-zero value is returned (EXIT_FAILURE=1). * ****************************************************************************/ diff --git a/nuttx/syscall/syscall_lookup.h b/nuttx/syscall/syscall_lookup.h index cdf177b30..49bd22b8a 100644 --- a/nuttx/syscall/syscall_lookup.h +++ b/nuttx/syscall/syscall_lookup.h @@ -100,11 +100,11 @@ SYSCALL_LOOKUP(up_assert, 2, STUB_up_assert) * 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 - SYSCALL_LOOKUP(posix_spawnp, 6, SYS_posixspawnp) + SYSCALL_LOOKUP(posix_spawnp, 6, SYS_posix_spawnp) # else - SYSCALL_LOOKUP(posix_spawn, 6, SYS_posixspawn) + SYSCALL_LOOKUP(posix_spawn, 6, SYS_posix_spawn) # endif SYSCALL_LOOKUP(execv, 2, SYS_execv) SYSCALL_LOOKUP(execl, 6, SYS_execl) |