sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

apps/nshlib/nsh_command.c: In all multi-column help output, calculate an optimal column width rather than using a hard-coded width that may or may not be appropriate.

Browse Source
This commit is contained in:
Gregory Nutt 2019-01-11 08:59:36 -06:00
parent cb4974cee8
commit d789194836
1 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
nshlib/nsh_command.c
View File

@ -587,10 +587,25 @@ static const struct cmdmap_s g_cmdmap[] =
#ifndef CONFIG_NSH_DISABLE_HELP
static inline void help_cmdlist(FAR struct nsh_vtbl_s *vtbl)
{
unsigned int colwidth;
unsigned int cmdwidth;
unsigned int i;
unsigned int j;
unsigned int k;
/* Pick an optimal column width */
for (k = 0, colwidth = 0; k < NUM_CMDS; k++)
{
cmdwidth = strlen(g_cmdmap[k].cmd);
if (cmdwidth > colwidth)
{
colwidth = cmdwidth;
}
}
colwidth += 2;
/* Print the command name in NUM_CMD_ROWS rows with CMDS_PER_LINE commands
* on each line.
*/
@ -602,11 +617,14 @@ static inline void help_cmdlist(FAR struct nsh_vtbl_s *vtbl)
j < CMDS_PER_LINE && k < NUM_CMDS;
j++, k += NUM_CMD_ROWS)
{
#ifdef CONFIG_NOPRINTF_FIELDWIDTH
nsh_output(vtbl, "%s\t", g_cmdmap[k].cmd);
#else
nsh_output(vtbl, "%-12s", g_cmdmap[k].cmd);
#endif
nsh_output(vtbl, "%s", g_cmdmap[k].cmd);
for (cmdwidth = strlen(g_cmdmap[k].cmd);
cmdwidth < colwidth;
cmdwidth++)
{
nsh_output(vtbl, " ");
}
}
nsh_output(vtbl, "\n");
@ -731,18 +749,30 @@ static inline void help_builtins(FAR struct nsh_vtbl_s *vtbl)
FAR const char *name;
int num_builtins;
int num_builtin_rows;
unsigned int colwidth;
unsigned int cmdwidth;
unsigned int i;
unsigned int j;
unsigned int k;
/* Count the number of built-in commands */
/* Count the number of built-in commands and get the optimal column width */
num_builtins = 0;
for (i = 0; builtin_getname(i) != NULL; i++)
colwidth = 0;
for (i = 0; (name = builtin_getname(i)) != NULL; i++)
{
num_builtins++;
cmdwidth = strlen(name);
if (cmdwidth > colwidth)
{
colwidth = cmdwidth;
}
}
colwidth += 2;
/* Calculate the number of rows */
num_builtin_rows = ((num_builtins + (BUILTINS_PER_LINE - 1)) /
@ -759,11 +789,14 @@ static inline void help_builtins(FAR struct nsh_vtbl_s *vtbl)
j++, k += num_builtin_rows)
{
name = builtin_getname(k);
#ifdef CONFIG_NOPRINTF_FIELDWIDTH
nsh_output(vtbl, "%s", name);
#else
nsh_output(vtbl, "%-20s", name);
#endif
for (cmdwidth = strlen(name);
cmdwidth < colwidth;
cmdwidth++)
{
nsh_output(vtbl, " ");
}
}
nsh_output(vtbl, "\n");