From 2c0a0260fc8169f43424b7fab135af6371a4be66 Mon Sep 17 00:00:00 2001 From: wangchengdong Date: Thu, 20 Nov 2025 14:49:50 +0800 Subject: [PATCH] sched/signal: Add support for disabling signals Fix build errors that occur when signals are disabled by excluding cmd_kill, cmd_sleep, cmd_usleep, and cmd_watch along with signal support. Signed-off-by: Chengdong Wang wangchengdong@lixiang.com --- nshlib/nsh.h | 8 ++++---- nshlib/nsh_command.c | 11 +++++------ nshlib/nsh_proccmds.c | 10 ++++++---- nshlib/nsh_timcmds.c | 2 +- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/nshlib/nsh.h b/nshlib/nsh.h index 8d037f5176f..de7b19d880e 100644 --- a/nshlib/nsh.h +++ b/nshlib/nsh.h @@ -1176,16 +1176,16 @@ 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_NSH_DISABLE_KILL +#if !defined(CONFIG_NSH_DISABLE_KILL) && !defined(CONFIG_DISABLE_SIGNALS) int cmd_kill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); #endif #if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL) int cmd_pkill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); #endif -#ifndef CONFIG_NSH_DISABLE_SLEEP +#if !defined(CONFIG_NSH_DISABLE_SLEEP) && !defined(CONFIG_DISABLE_SIGNALS) int cmd_sleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); #endif -#ifndef CONFIG_NSH_DISABLE_USLEEP +#if !defined(CONFIG_NSH_DISABLE_USLEEP) && !defined(CONFIG_DISABLE_SIGNALS) int cmd_usleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); #endif @@ -1224,7 +1224,7 @@ int cmd_alias(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); int cmd_unalias(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); #endif -#ifndef CONFIG_NSH_DISABLE_WATCH +#if !defined(CONFIG_NSH_DISABLE_WATCH) && !defined(CONFIG_DISABLE_SIGNALS) int cmd_watch(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv); #endif diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c index 3911e0844ce..19fad1509bf 100644 --- a/nshlib/nsh_command.c +++ b/nshlib/nsh_command.c @@ -300,11 +300,11 @@ static const struct cmdmap_s g_cmdmap[] = CMD_MAP("irqinfo", cmd_irqinfo, 1, 1, NULL), #endif -#ifndef CONFIG_NSH_DISABLE_KILL +#if !defined(CONFIG_NSH_DISABLE_KILL) && !defined(CONFIG_DISABLE_SIGNALS) CMD_MAP("kill", cmd_kill, 2, 3, "[-] "), #endif -#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL) +#if defined(CONFIG_FS_PROCFS) && !defined(CONFIG_NSH_DISABLE_PKILL) && !defined(CONFIG_DISABLE_SIGNALS) CMD_MAP("pkill", cmd_pkill, 2, 3, "[-] "), #endif @@ -571,7 +571,7 @@ static const struct cmdmap_s g_cmdmap[] = #endif #endif -#ifndef CONFIG_NSH_DISABLE_SLEEP +#if !defined(CONFIG_NSH_DISABLE_SLEEP) && !defined(CONFIG_DISABLE_SIGNALS) CMD_MAP("sleep", cmd_sleep, 2, 2, ""), #endif @@ -652,12 +652,11 @@ static const struct cmdmap_s g_cmdmap[] = CMD_MAP("userdel", cmd_userdel, 2, 2, ""), # endif #endif - -#ifndef CONFIG_NSH_DISABLE_USLEEP +#if !defined(CONFIG_NSH_DISABLE_USLEEP) && !defined(CONFIG_DISABLE_SIGNALS) CMD_MAP("usleep", cmd_usleep, 2, 2, ""), #endif -#ifndef CONFIG_NSH_DISABLE_WATCH +#if !defined(CONFIG_NSH_DISABLE_WATCH) && !defined(CONFIG_DISABLE_SIGNALS) CMD_MAP("watch", cmd_watch, 2, 6, "[-n] interval [-c] count "), #endif diff --git a/nshlib/nsh_proccmds.c b/nshlib/nsh_proccmds.c index fe98105648c..9f05bdab4c5 100644 --- a/nshlib/nsh_proccmds.c +++ b/nshlib/nsh_proccmds.c @@ -993,7 +993,7 @@ 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_SIGNALS) int cmd_kill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv) { FAR char *ptr; @@ -1096,7 +1096,9 @@ int cmd_kill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv) * 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_SIGNALS) int cmd_pkill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv) { FAR const char *name; @@ -1197,7 +1199,7 @@ int cmd_pkill(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv) * Name: cmd_sleep ****************************************************************************/ -#ifndef CONFIG_NSH_DISABLE_SLEEP +#if !defined(CONFIG_NSH_DISABLE_SLEEP) && !defined(CONFIG_DISABLE_SIGNALS) int cmd_sleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv) { UNUSED(argc); @@ -1221,7 +1223,7 @@ 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_SIGNALS) int cmd_usleep(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv) { UNUSED(argc); diff --git a/nshlib/nsh_timcmds.c b/nshlib/nsh_timcmds.c index a0952acc1b0..36e07755750 100644 --- a/nshlib/nsh_timcmds.c +++ b/nshlib/nsh_timcmds.c @@ -550,7 +550,7 @@ int cmd_timedatectl(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv) } #endif -#ifndef CONFIG_NSH_DISABLE_WATCH +#if !defined(CONFIG_NSH_DISABLE_WATCH) && !defined(CONFIG_DISABLE_SIGNALS) int cmd_watch(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv) { int interval = 2;