fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-04 09:51:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

PM update; NSH extension to catch return values

Browse Source 
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4987 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
2012-07-28 15:18:26 +00:00
parent 0464a6d9be
commit 3f57f313a1
5 changed files with 83 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/nshlib/nsh_apps.c
+38 -5
View File
@@ -84,7 +84,22 @@
****************************************************************************/
/****************************************************************************
* Name: nsh_execute
* Name: nsh_execapp
*
* Description:
* Attempt to execute the application task whose name is 'cmd'
*
* Returned Value:
* -1 (ERRROR) if the application task corresponding to 'cmd' could not
* be started (possibly because it doesn not exist).
* 0 (OK) if the application task corresponding to 'cmd' was
* and successfully started. If CONFIG_SCHED_WAITPID is
* defined, this return value also indicates that the
* application returned successful status (EXIT_SUCCESS)
* 1 If CONFIG_SCHED_WAITPID is defined, then this return value
* indicates that the application task was spawned successfully
* but returned failure exit status.
*
****************************************************************************/
int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
@@ -103,7 +118,21 @@ int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
#ifdef CONFIG_SCHED_WAITPID
if (vtbl->np.np_bg == false)
{
waitpid(ret, NULL, 0);
int rc = 0;
waitpid(ret, &rc, 0);
/* We can't return the exact status (nsh has nowhere to put it)
* so just pass back zero/nonzero in a fashion that doesn't look
* like an error.
*/
ret = (rc == 0) ? OK : 1;
/* TODO: Set the environment variable '?' to a string corresponding
* to WEXITSTATUS(rc) so that $? will expand to the exit status of
* the most recently executed task.
*/
}
else
#endif
@@ -111,11 +140,15 @@ int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
struct sched_param param;
sched_getparam(0, &param);
nsh_output(vtbl, "%s [%d:%d]\n", cmd, ret, param.sched_priority);
/* Backgrounded commands always 'succeed' as long as we can start
* them.
*/
ret = OK;
}
return OK;
return ret;
}
#endif /* CONFIG_NSH_BUILTIN_APPS */