Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-01 20:29:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

signals: fix build and runtime issues when signals all isabled

Browse source 
Fix build and runtime issues when signals all disabled.

Signed-off-by: Chengdong Wang <wangchengdong@lixiang.com>
This commit is contained in:
wangchengdong 2026-01-16 22:47:13 +08:00 • committed by Donny(董九柱)
parent 9c85568c4f
commit d9afe2db8c
19 changed files with 172 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nshlib/nsh.h
View file

@ -1179,6 +1179,7 @@ int cmd_switchboot(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
int cmd_unset(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
#endif
#ifndef CONFIG_DISABLE_ALL_SIGNALS
#ifndef CONFIG_NSH_DISABLE_KILL
int cmd_kill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
#endif
@ -1191,6 +1192,7 @@ int cmd_switchboot(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
#ifndef CONFIG_NSH_DISABLE_USLEEP
int cmd_usleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
#endif
#endif /* !CONFIG_DISABLE_ALL_SIGNALS */
#ifndef CONFIG_NSH_DISABLE_UPTIME
int cmd_uptime(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);

26
nshlib/nsh_command.c
View file

@ -304,14 +304,6 @@ static const struct cmdmap_s g_cmdmap[] =
CMD_MAP("irqinfo", cmd_irqinfo, 1, 1, NULL),
#endif
#ifndef CONFIG_NSH_DISABLE_KILL
CMD_MAP("kill", cmd_kill, 2, 3, "[-<signal>] <pid>"),
#endif
#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL)
CMD_MAP("pkill", cmd_pkill, 2, 3, "[-<signal>] <name>"),
#endif
#ifndef CONFIG_DISABLE_MOUNTPOINT
# if defined(CONFIG_DEV_LOOP) && !defined(CONFIG_NSH_DISABLE_LOSETUP)
CMD_MAP("losetup", cmd_losetup, 3, 6,
@ -575,10 +567,24 @@ static const struct cmdmap_s g_cmdmap[] =
#endif
#endif
#ifndef CONFIG_DISABLE_ALL_SIGNALS
#ifndef CONFIG_NSH_DISABLE_KILL
CMD_MAP("kill", cmd_kill, 2, 3, "[-<signal>] <pid>"),
#endif
#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL)
CMD_MAP("pkill", cmd_pkill, 2, 3, "[-<signal>] <name>"),
#endif
#ifndef CONFIG_NSH_DISABLE_SLEEP
CMD_MAP("sleep", cmd_sleep, 2, 2, "<sec>"),
#endif
#ifndef CONFIG_NSH_DISABLE_USLEEP
CMD_MAP("usleep", cmd_usleep, 2, 2, "<usec>"),
#endif
#endif
#if !defined(CONFIG_NSH_DISABLESCRIPT) && !defined(CONFIG_NSH_DISABLE_SOURCE)
CMD_MAP("source", cmd_source, 2, 2, "<script-path>"),
#endif
@ -657,10 +663,6 @@ static const struct cmdmap_s g_cmdmap[] =
# endif
#endif
#ifndef CONFIG_NSH_DISABLE_USLEEP
CMD_MAP("usleep", cmd_usleep, 2, 2, "<usec>"),
#endif
#ifndef CONFIG_NSH_DISABLE_WATCH
CMD_MAP("watch", cmd_watch,
2, 6, "[-n] interval [-c] count <command>"),

13
nshlib/nsh_proccmds.c
View file

@ -995,7 +995,8 @@ int cmd_pidof(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
* Name: cmd_kill
****************************************************************************/
#ifndef CONFIG_NSH_DISABLE_KILL
#if !defined(CONFIG_NSH_DISABLE_KILL) && \
!defined(CONFIG_DISABLE_ALL_SIGNALS)
int cmd_kill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
{
FAR char *ptr;
@ -1098,7 +1099,8 @@ invalid_arg:
* Name: cmd_pkill
****************************************************************************/
#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL)
#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL) && \
!defined(CONFIG_DISABLE_ALL_SIGNALS)
int cmd_pkill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
{
FAR const char *name;
@ -1199,7 +1201,8 @@ invalid_arg:
* Name: cmd_sleep
****************************************************************************/
#ifndef CONFIG_NSH_DISABLE_SLEEP
#if !defined(CONFIG_NSH_DISABLE_SLEEP) && \
!defined(CONFIG_DISABLE_ALL_SIGNALS)
int cmd_sleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
{
UNUSED(argc);
@ -1222,8 +1225,8 @@ int cmd_sleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
/****************************************************************************
* Name: cmd_usleep
****************************************************************************/
#ifndef CONFIG_NSH_DISABLE_USLEEP
#if !defined(CONFIG_NSH_DISABLE_USLEEP) && \
!defined(CONFIG_DISABLE_ALL_SIGNALS)
int cmd_usleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv)
{
UNUSED(argc);