nvme/nvme-cli
1
0
Fork 0
Code Issues Activity

Merging upstream version 2.14.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-05-22 13:00:36 +02:00
parent 0d9181726f
commit f268303a51
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
572 changed files with 4636 additions and 1730 deletions
Download patch file Download diff file Expand all files Collapse all files

43
plugin.c
View file

@ -34,7 +34,7 @@ static int help(int argc, char **argv, struct plugin *plugin)
int i;
if (argc == 1) {
general_help(plugin);
general_help(plugin, NULL);
return 0;
}
@ -52,6 +52,9 @@ static int help(int argc, char **argv, struct plugin *plugin)
if (execlp("man", "man", man, (char *)NULL))
perror(argv[1]);
}
general_help(plugin, str);
return 0;
}
@ -65,7 +68,7 @@ static void usage_cmd(struct plugin *plugin)
printf("usage: %s %s\n", prog->name, prog->usage);
}
void general_help(struct plugin *plugin)
void general_help(struct plugin *plugin, char *str)
{
struct program *prog = plugin->parent;
struct plugin *extension;
@ -88,6 +91,8 @@ void general_help(struct plugin *plugin)
}
printf("\nThe following are all implemented sub-commands:\n");
if (str)
printf("Note: Only sub-commands including %s\n", str);
/*
* iterate through all commands to get maximum length
@ -100,12 +105,16 @@ void general_help(struct plugin *plugin)
}
i = 0;
for (; plugin->commands[i]; i++)
printf(" %-*s %s\n", padding, plugin->commands[i]->name,
plugin->commands[i]->help);
for (; plugin->commands[i]; i++) {
if (!str || strstr(plugin->commands[i]->name, str))
printf(" %-*s %s\n", padding, plugin->commands[i]->name,
plugin->commands[i]->help);
}
printf(" %-*s %s\n", padding, "version", "Shows the program version");
printf(" %-*s %s\n", padding, "help", "Display this help");
if (!str || strstr("version", str))
printf(" %-*s %s\n", padding, "version", "Shows the program version");
if (!str || strstr("help", str))
printf(" %-*s %s\n", padding, "help", "Display this help");
printf("\n");
if (plugin->name)
@ -127,8 +136,12 @@ void general_help(struct plugin *plugin)
return;
printf("\nThe following are all installed plugin extensions:\n");
if (str)
printf("Note: Only extensions including %s\n", str);
while (extension) {
printf(" %-*s %s\n", 15, extension->name, extension->desc);
if (!str || strstr(extension->name, str))
printf(" %-*s %s\n", 15, extension->name, extension->desc);
extension = extension->next;
}
printf("\nSee '%s <plugin> help' for more information on a plugin\n",
@ -144,9 +157,10 @@ int handle_plugin(int argc, char **argv, struct plugin *plugin)
struct command **cmd = plugin->commands;
struct command *cr = NULL;
bool cr_valid = false;
int dash_count = 0;
if (!argc) {
general_help(plugin);
general_help(plugin, NULL);
return 0;
}
@ -156,11 +170,14 @@ int handle_plugin(int argc, char **argv, struct plugin *plugin)
sprintf(use, "%s %s %s <device> [OPTIONS]", prog->name, plugin->name, str);
argconfig_append_usage(use);
/* translate --help and --version into commands */
while (*str == '-')
str++;
/* translate --help, -h and --version into commands */
while (str[dash_count] == '-')
dash_count++;
if (!strcmp(str, "help"))
if (dash_count)
str += dash_count;
if (!strcmp(str, "help") || (dash_count == 1 && !strcmp(str, "h")))
return help(argc, argv, plugin);
if (!strcmp(str, "version"))
return version_cmd(plugin);