diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-11-14 09:53:11 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-11-14 09:53:11 -0600 |
commit | 899b59b58caa3827312019f492f8780bdaec8968 (patch) | |
tree | f2d454e24e5d2c0ecbf5a7303d391adfbdff2536 | |
parent | af9256f22d7bf2aecb5a12433e38e5b3bb801ee4 (diff) | |
download | px4-nuttx-899b59b58caa3827312019f492f8780bdaec8968.tar.gz px4-nuttx-899b59b58caa3827312019f492f8780bdaec8968.tar.bz2 px4-nuttx-899b59b58caa3827312019f492f8780bdaec8968.zip |
Fix some compile issues introduces with removal of CONFIG_MAX_TASK_ARGS
-rw-r--r-- | nuttx/binfmt/binfmt_exec.c | 6 | ||||
-rw-r--r-- | nuttx/sched/task/task_vfork.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/nuttx/binfmt/binfmt_exec.c b/nuttx/binfmt/binfmt_exec.c index 0dbd13b0e..642eb4541 100644 --- a/nuttx/binfmt/binfmt_exec.c +++ b/nuttx/binfmt/binfmt_exec.c @@ -138,9 +138,9 @@ static inline int binfmt_copyargv(FAR struct binary_s *bin, FAR char * const *ar /* Copy the argv list */ - binp->argv = (FAR char **)bin->argbuffer; - ptr = bin->argbuffer + argvsize; - for (; i < argv[i]; i++) + bin->argv = (FAR char **)bin->argbuffer; + ptr = bin->argbuffer + argvsize; + for (; argv[i]; i++) { bin->argv[i] = ptr; argsize = strlen(argv[i]) + 1; diff --git a/nuttx/sched/task/task_vfork.c b/nuttx/sched/task/task_vfork.c index 3b0ffad76..20e74179b 100644 --- a/nuttx/sched/task/task_vfork.c +++ b/nuttx/sched/task/task_vfork.c @@ -116,7 +116,9 @@ static inline void vfork_namesetup(FAR struct tcb_s *parent, static inline int vfork_stackargsetup(FAR struct tcb_s *parent, FAR struct task_tcb_s *child) { - /* Is the parent a task? or a pthread? */ + /* Is the parent a task? or a pthread? Only tasks (and kernel threads) + * have command line arguments. + */ child->argv = NULL; if ((parent->flags & TCB_FLAG_TTYPE_MASK) != TCB_FLAG_TTYPE_PTHREAD) @@ -159,6 +161,8 @@ static inline int vfork_stackargsetup(FAR struct tcb_s *parent, child->argv[argc] = NULL; } + + return OK; } /**************************************************************************** |