sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "apps/builtin/exec_builtin.c: Fix a error introduced by recent comments. Found in build testing."

Browse Source 
This reverts commit 64e423a49c.
This commit is contained in:
Gregory Nutt 2018-08-22 12:06:28 -06:00
parent 3a2a480eeb
commit cd62ab5398
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
builtin/exec_builtin.c
View File

@ -181,26 +181,20 @@ int exec_builtin(FAR const char *appname, FAR char * const *argv,
} }
} }
#idef CONFIG_LIBC_EXECFUNCS /* Start the built-in */
/* A NULL entry point implies that the task is a loadable application */
if (builtin->main == NULL) if (builtin->main)
{ {
/* Load and execute the application. */
ret = posix_spawn(&pid, builtin->name, &file_actions,
&attr, (argv) ? &argv[1] : (FAR char * const *)NULL,
NULL);
}
else
#endif
{
/* Start the built-in */
ret = task_spawn(&pid, builtin->name, builtin->main, &file_actions, ret = task_spawn(&pid, builtin->name, builtin->main, &file_actions,
&attr, (argv) ? &argv[1] : (FAR char * const *)NULL, &attr, (argv) ? &argv[1] : (FAR char * const *)NULL,
(FAR char * const *)NULL); (FAR char * const *)NULL);
} }
else
{
ret = posix_spawn(&pid, builtin->name, &file_actions,
&attr, (argv) ? &argv[1] : (FAR char * const *)NULL,
NULL);
}
if (ret != 0) if (ret != 0)
{ {