Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions nshlib/nsh.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sleep is an important function, we need support the partial disable signal functionality to make CONFIG_DISABLE_SIGNALS is useful in the real case.

#endif

Expand Down Expand Up @@ -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

Expand Down
11 changes: 5 additions & 6 deletions nshlib/nsh_command.c
Original file line number Diff line number Diff line change
Expand Up @@ -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, "[-<signal>] <pid>"),
#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, "[-<signal>] <name>"),
#endif

Expand Down Expand Up @@ -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, "<sec>"),
#endif

Expand Down Expand Up @@ -652,12 +652,11 @@ static const struct cmdmap_s g_cmdmap[] =
CMD_MAP("userdel", cmd_userdel, 2, 2, "<username>"),
# endif
#endif

#ifndef CONFIG_NSH_DISABLE_USLEEP
#if !defined(CONFIG_NSH_DISABLE_USLEEP) && !defined(CONFIG_DISABLE_SIGNALS)
CMD_MAP("usleep", cmd_usleep, 2, 2, "<usec>"),
#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 <command>"),
#endif
Expand Down
10 changes: 6 additions & 4 deletions nshlib/nsh_proccmds.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion nshlib/nsh_timcmds.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading