diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/examples/pashello/README.txt | 2 | ||||
-rw-r--r-- | apps/nshlib/README.txt | 16 | ||||
-rw-r--r-- | apps/nshlib/nsh_parse.c | 17 |
3 files changed, 17 insertions, 18 deletions
diff --git a/apps/examples/pashello/README.txt b/apps/examples/pashello/README.txt index b976f18cf..b19846966 100644 --- a/apps/examples/pashello/README.txt +++ b/apps/examples/pashello/README.txt @@ -30,5 +30,5 @@ device.c device.c implements a simple device driver. Reads from this device will access the in-memory copy of hello.pex This device driver is - registered as /dev/pashello in the psuedo filesystem. + registered as /dev/pashello in the pseudo filesystem. diff --git a/apps/nshlib/README.txt b/apps/nshlib/README.txt index a6cb2d7d7..d8edd8969 100644 --- a/apps/nshlib/README.txt +++ b/apps/nshlib/README.txt @@ -505,14 +505,14 @@ o mkfatfs <path> Format a fat file system on the block device specified by path. NSH provides this command to access the mkfatfs() NuttX API. - This block device must reside in the NuttX psuedo filesystem and + This block device must reside in the NuttX pseudo filesystem and must have been created by some call to register_blockdriver() (see include/nuttx/fs/fs.h). o mkfifo <path> Creates a FIFO character device anywhere in the pseudo file system, - creating whatever psuedo directories that may be needed to complete + creating whatever pseudo directories that may be needed to complete the full path. By convention, however, device drivers are place in the standard /dev directory. After it is created, the FIFO device may be used as any other device driver. NSH provides this command @@ -584,7 +584,7 @@ o mount [-t <fstype> <block-device> <dir-path>] If the mount parameters are provied on the command after the 'mount' command, then the 'mount' command will mount a file system in the - NuttX psuedo-file system. 'mount' performs a three way association, + NuttX pseudo-file system. 'mount' performs a three way association, binding: File system. The '-t <fstype>' option identifies the type of @@ -592,19 +592,19 @@ o mount [-t <fstype> <block-device> <dir-path>] of this writing, vfat is the only supported value for <fstype> Block Device. The <block-device> argument is the full or relative - path to a block driver inode in the psuedo filesystem. By convention, + path to a block driver inode in the pseudo filesystem. By convention, this is a name under the /dev sub-directory. This <block-device> must have been previously formatted with the same file system type as specified by <fstype> - Mount Point. The mount point is the location in the psuedo file + Mount Point. The mount point is the location in the pseudo file system where the mounted volume will appear. This mount point - can only reside in the NuttX psuedo filesystem. By convention, this + can only reside in the NuttX pseudo filesystem. By convention, this mount point is a subdirectory under /mnt. The mount command will - create whatever psuedo directories that may be needed to complete + create whatever pseudo directories that may be needed to complete the full path but the full path must not already exist. - After the volume has been mounted in the NuttX psuedo file + After the volume has been mounted in the NuttX pseudo file system, it may be access in the same way as other objects in the file system. diff --git a/apps/nshlib/nsh_parse.c b/apps/nshlib/nsh_parse.c index 049444397..165f842fc 100644 --- a/apps/nshlib/nsh_parse.c +++ b/apps/nshlib/nsh_parse.c @@ -88,12 +88,12 @@ # define MAX_ARGV_ENTRIES (NSH_MAX_ARGUMENTS+4) #endif -/* Help layout */ +/* Help command summary layout */ #define MAX_CMDLEN 12 -#define CMDS_PER_LINE 5 +#define CMDS_PER_LINE 6 -#define NUM_CMDS (sizeof(g_cmdmap)/sizeof(struct cmdmap_s)) +#define NUM_CMDS ((sizeof(g_cmdmap)/sizeof(struct cmdmap_s)) - 1) #define NUM_CMD_ROWS ((NUM_CMDS + (CMDS_PER_LINE-1)) / CMDS_PER_LINE) /**************************************************************************** @@ -443,7 +443,7 @@ static inline void help_cmdlist(FAR struct nsh_vtbl_s *vtbl) for (i = 0; i < NUM_CMD_ROWS; i++) { nsh_output(vtbl, " "); - for (j = 0, k = i; j < CMDS_PER_LINE && k < NUM_CMDS; j++, k += CMDS_PER_LINE) + for (j = 0, k = i; j < CMDS_PER_LINE && k < NUM_CMDS; j++, k += NUM_CMD_ROWS) { nsh_output(vtbl, "%-12s", g_cmdmap[k].cmd); } @@ -516,6 +516,7 @@ static int help_cmd(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd) { /* Yes... show it */ + nsh_output(vtbl, "%s usage:", cmd); help_showcmd(vtbl, cmdmap); return OK; } @@ -574,14 +575,14 @@ static inline void help_builtins(FAR struct nsh_vtbl_s *vtbl) static int cmd_help(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { FAR const char *cmd = NULL; -#ifdef CONFIG_NSH_HELP_TERSE +#ifndef CONFIG_NSH_HELP_TERSE bool verbose = false; int i; #endif /* The command may be followed by a verbose option */ -#ifdef CONFIG_NSH_HELP_TERSE +#ifndef CONFIG_NSH_HELP_TERSE i = 1; if (argc > i) { @@ -618,14 +619,13 @@ static int cmd_help(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { /* Yes.. show the single command */ - nsh_output(vtbl, "%s usage:", cmd); help_cmd(vtbl, cmd); } else { /* In verbose mode, show detailed help for all commands */ -#ifdef CONFIG_NSH_HELP_TERSE +#ifndef CONFIG_NSH_HELP_TERSE if (verbose) { nsh_output(vtbl, "Where <cmd> is one of:\n"); @@ -637,7 +637,6 @@ static int cmd_help(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) else #endif { - nsh_output(vtbl, "help usage:"); help_cmd(vtbl, "help"); nsh_output(vtbl, "\n"); help_cmdlist(vtbl); |