Skip to content

nsh/command: do not show the module application in built-in list #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
masayuki2009 merged 1 commit into from
Apr 3, 2020
Merged

nsh/command: do not show the module application in built-in list #158

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 27 additions & 10 deletions nshlib/nsh_command.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,12 +766,12 @@ static inline void help_allcmds(FAR struct nsh_vtbl_s *vtbl)
static inline void help_builtins(FAR struct nsh_vtbl_s *vtbl)
{
#ifdef CONFIG_NSH_BUILTIN_APPS
FAR const char *name;
unsigned int num_builtins;
unsigned int column_width;
unsigned int builtin_width;
FAR const struct builtin_s *builtin;
unsigned int builtins_per_line;
unsigned int num_builtin_rows;
unsigned int builtin_width;
unsigned int num_builtins;
unsigned int column_width;
unsigned int i;
unsigned int j;
unsigned int k;
Expand All @@ -781,17 +781,29 @@ static inline void help_builtins(FAR struct nsh_vtbl_s *vtbl)
num_builtins = 0;
column_width = 0;

for (i = 0; (name = builtin_getname(i)) != NULL; i++)
for (i = 0; (builtin = builtin_for_index(i)) != NULL; i++)
{
if (builtin->main == NULL)
{
continue;
}

num_builtins++;

builtin_width = strlen(name);
builtin_width = strlen(builtin->name);
if (builtin_width > column_width)
{
column_width = builtin_width;
}
}

/* Skip the printing if no available built-in commands */

if (num_builtins == 0)
{
return;
}

column_width += 2;

/* Determine the number of commands to put on one line */
Expand All @@ -817,13 +829,18 @@ static inline void help_builtins(FAR struct nsh_vtbl_s *vtbl)
{
nsh_output(vtbl, " ");
for (j = 0, k = i;
j < builtins_per_line && k < num_builtins;
j < builtins_per_line &&
(builtin = builtin_for_index(k));
j++, k += num_builtin_rows)
{
name = builtin_getname(k);
nsh_output(vtbl, "%s", name);
if (builtin->main == NULL)
{
continue;
}

nsh_output(vtbl, "%s", builtin->name);

for (builtin_width = strlen(name);
for (builtin_width = strlen(builtin->name);
builtin_width < column_width;
builtin_width++)
{
Expand Down