From e4914622b3166eef092be13b24456e1705c84e7d Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 4 Aug 2016 12:57:02 -0600 Subject: [PATCH] NSH: cmd_mkfifo depend son CONFIG_DEV_PIPE_SIZE > 0 --- nshlib/README.txt | 2 +- nshlib/nsh.h | 3 ++- nshlib/nsh_command.c | 3 ++- nshlib/nsh_fscmds.c | 7 ++++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/nshlib/README.txt b/nshlib/README.txt index a5e3c3003..1cca3a1ef 100644 --- a/nshlib/README.txt +++ b/nshlib/README.txt @@ -1201,7 +1201,7 @@ Command Dependencies on Configuration Settings mb,mh,mw --- mkdir (((!CONFIG_DISABLE_MOUNTPOINT && CONFIG_FS_WRITABLE) || !CONFIG_DISABLE_PSEUDOFS_OPERATIONS) && CONFIG_NFILE_DESCRIPTORS > 0) mkfatfs !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_FAT - mkfifo CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_PIPES + mkfifo CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_PIPES && CONFIG_DEV_PIPE_SIZE > 0 mkrd !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_WRITABLE (see note 4) mount !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_READABLE (see note 3) mv (((!CONFIG_DISABLE_MOUNTPOINT && CONFIG_FS_WRITABLE) || !CONFIG_DISABLE_PSEUDOFS_OPERATIONS) && CONFIG_NFILE_DESCRIPTORS > 0) (see note 4) diff --git a/nshlib/nsh.h b/nshlib/nsh.h index 3f6f57414..b7587b5e4 100644 --- a/nshlib/nsh.h +++ b/nshlib/nsh.h @@ -1039,7 +1039,8 @@ int cmd_lsmod(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # if defined(CONFIG_SMART_DEV_LOOP) && !defined(CONFIG_NSH_DISABLE_LOSMART) int cmd_losmart(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# if defined(CONFIG_PIPES) && !defined(CONFIG_NSH_DISABLE_MKFIFO) +# if defined(CONFIG_PIPES) && CONFIG_DEV_PIPE_SIZE > 0 && \ + !defined(CONFIG_NSH_DISABLE_MKFIFO) int cmd_mkfifo(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif # ifdef CONFIG_FS_READABLE diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c index 7aa6b1ad3..0349a6660 100644 --- a/nshlib/nsh_command.c +++ b/nshlib/nsh_command.c @@ -297,7 +297,8 @@ static const struct cmdmap_s g_cmdmap[] = #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 -# if defined(CONFIG_PIPES) && !defined(CONFIG_NSH_DISABLE_MKFIFO) +# if defined(CONFIG_PIPES) && CONFIG_DEV_PIPE_SIZE > 0 && \ + !defined(CONFIG_NSH_DISABLE_MKFIFO) { "mkfifo", cmd_mkfifo, 2, 2, "" }, # endif #endif diff --git a/nshlib/nsh_fscmds.c b/nshlib/nsh_fscmds.c index 3bc89feab..92fa97afc 100644 --- a/nshlib/nsh_fscmds.c +++ b/nshlib/nsh_fscmds.c @@ -1181,7 +1181,8 @@ int cmd_mkfatfs(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #if CONFIG_NFILE_DESCRIPTORS > 0 -#if defined(CONFIG_PIPES) && !defined(CONFIG_NSH_DISABLE_MKFIFO) +# if defined(CONFIG_PIPES) && CONFIG_DEV_PIPE_SIZE > 0 && \ + !defined(CONFIG_NSH_DISABLE_MKFIFO) int cmd_mkfifo(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *fullpath = nsh_getfullpath(vtbl, argv[1]); @@ -1200,8 +1201,8 @@ int cmd_mkfifo(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) return ret; } -#endif -#endif +#endif # CONFIG_PIPES && CONFIG_DEV_PIPE_SIZE > 0 && !CONFIG_NSH_DISABLE_MKFIFO +#endif # CONFIG_NFILE_DESCRIPTORS > 0 /**************************************************************************** * Name: cmd_mkrd