2011-11-26 20:33:59 +00:00
|
|
|
#include <common.h>
|
|
|
|
#include <command.h>
|
2014-05-15 09:08:56 +00:00
|
|
|
#include <getopt.h>
|
|
|
|
#include <environment.h>
|
2011-11-26 20:33:59 +00:00
|
|
|
#include <magicvar.h>
|
2014-11-06 08:05:54 +00:00
|
|
|
#include <malloc.h>
|
2011-11-26 20:33:59 +00:00
|
|
|
|
2014-11-06 08:05:54 +00:00
|
|
|
static LIST_HEAD(magicvars);
|
|
|
|
|
|
|
|
struct magicvar_dyn {
|
|
|
|
char *name;
|
|
|
|
char *description;
|
|
|
|
struct list_head list;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void magicvar_print_one(struct magicvar_dyn *md, int verbose)
|
|
|
|
{
|
|
|
|
printf("%-32s %s\n", md->name, md->description);
|
|
|
|
|
|
|
|
if (verbose) {
|
|
|
|
const char *val = getenv(md->name);
|
|
|
|
if (val && strlen(val))
|
|
|
|
printf(" %s\n", val);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
struct magicvar_dyn *magicvar_find(const char *name)
|
2011-11-26 20:33:59 +00:00
|
|
|
{
|
2014-11-06 08:05:54 +00:00
|
|
|
struct magicvar_dyn *md;
|
|
|
|
|
|
|
|
list_for_each_entry(md, &magicvars, list)
|
|
|
|
if (!strcmp(md->name, name))
|
|
|
|
return md;
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void magicvar_remove(struct magicvar_dyn *md)
|
|
|
|
{
|
|
|
|
free(md->name);
|
|
|
|
free(md->description);
|
|
|
|
list_del(&md->list);
|
|
|
|
free(md);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int compare(struct list_head *a, struct list_head *b)
|
|
|
|
{
|
|
|
|
char *na = (char*)list_entry(a, struct magicvar_dyn, list)->name;
|
|
|
|
char *nb = (char*)list_entry(b, struct magicvar_dyn, list)->name;
|
|
|
|
|
|
|
|
return strcmp(na, nb);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int magicvar_add(const char *name, const char *description)
|
|
|
|
{
|
|
|
|
struct magicvar_dyn *md;
|
|
|
|
|
|
|
|
md = magicvar_find(name);
|
|
|
|
if (md)
|
|
|
|
magicvar_remove(md);
|
|
|
|
|
|
|
|
md = xzalloc(sizeof(*md));
|
|
|
|
md->name = xstrdup(name);
|
|
|
|
md->description = xstrdup(description);
|
|
|
|
|
|
|
|
list_add_sort(&md->list, &magicvars, compare);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void magicvar_build(void)
|
|
|
|
{
|
|
|
|
static int first = 1;
|
2011-11-26 20:33:59 +00:00
|
|
|
struct magicvar *m;
|
2014-11-06 08:05:54 +00:00
|
|
|
|
|
|
|
if (!first)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (m = &__barebox_magicvar_start;
|
|
|
|
m != &__barebox_magicvar_end;
|
|
|
|
m++)
|
|
|
|
magicvar_add(m->name, m->description);
|
|
|
|
|
|
|
|
first = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int do_magicvar(int argc, char *argv[])
|
|
|
|
{
|
|
|
|
struct magicvar_dyn *md;
|
2014-05-15 09:08:56 +00:00
|
|
|
int opt;
|
2014-11-06 08:05:54 +00:00
|
|
|
int verbose = 0, add = 0;
|
2014-05-15 09:08:56 +00:00
|
|
|
|
2014-11-06 08:05:54 +00:00
|
|
|
magicvar_build();
|
|
|
|
|
|
|
|
while ((opt = getopt(argc, argv, "va")) > 0) {
|
2014-05-15 09:08:56 +00:00
|
|
|
switch (opt) {
|
|
|
|
case 'v':
|
|
|
|
verbose = 1;
|
|
|
|
break;
|
2014-11-06 08:05:54 +00:00
|
|
|
case 'a':
|
|
|
|
add = 1;
|
|
|
|
break;
|
2014-05-15 09:08:56 +00:00
|
|
|
default:
|
|
|
|
return COMMAND_ERROR_USAGE;
|
|
|
|
}
|
|
|
|
}
|
2011-11-26 20:33:59 +00:00
|
|
|
|
2014-11-06 08:05:54 +00:00
|
|
|
if (add) {
|
|
|
|
if (optind + 2 != argc)
|
|
|
|
return COMMAND_ERROR_USAGE;
|
|
|
|
|
|
|
|
return magicvar_add(argv[optind], argv[optind + 1]);
|
2014-05-15 09:08:56 +00:00
|
|
|
}
|
2011-11-26 20:33:59 +00:00
|
|
|
|
2014-11-06 08:05:54 +00:00
|
|
|
list_for_each_entry(md, &magicvars, list)
|
|
|
|
magicvar_print_one(md, verbose);
|
|
|
|
|
2011-11-26 20:33:59 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-05-15 09:08:56 +00:00
|
|
|
|
|
|
|
BAREBOX_CMD_HELP_START(magicvar)
|
|
|
|
BAREBOX_CMD_HELP_TEXT("Options:")
|
|
|
|
BAREBOX_CMD_HELP_OPT ("-v", "verbose (list all value if there is one)")
|
2014-11-06 08:05:54 +00:00
|
|
|
BAREBOX_CMD_HELP_OPT ("-a <NAME> <DESC>", "Add a new magicvar")
|
2014-05-15 09:08:56 +00:00
|
|
|
BAREBOX_CMD_HELP_END
|
|
|
|
|
2011-11-26 20:33:59 +00:00
|
|
|
BAREBOX_CMD_START(magicvar)
|
|
|
|
.cmd = do_magicvar,
|
commands: harmonize in-barebox documentation
This patch does probably too much, but it's hard (and very
cumbersome/time consuming) to break it out. What is does is this:
* each command has one short description, e.g. "list MUX configuration"
* made sure the short descriptions start lowercase
* each command has one usage. That string contains just the
options, e.g. "[-npn]". It's not part of the long help text.
* that is, it doesn't say "[OPTIONS]" anymore, every usable option
is listed by character in this (short) option string (the long
description is in the long help text, as before)
* help texts have been reworked, to make them
- sometimes smaller
- sometimes describe the options better
- more often present themselves in a nicer format
* all long help texts are now created with BUSYBOX_CMD_HELP_
macros, no more 'static const __maybe_unused char cmd_foobar_help[]'
* made sure the long help texts starts uppercase
* because cmdtp->name and cmdtp->opts together provide the new usage,
all "Usage: foobar" texts have been removed from the long help texts
* BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this
is nicer in the source code
* BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself
* made sure no line gets longer than 77 characters
* delibertely renamed cmdtp->usage, so that we can get compile-time
errors (e.g. in out-of-tree modules that use register_command()
* the 'help' command can now always emit the usage, even without
compiled long help texts
* 'help -v' gives a list of commands with their short description, this
is similar like the old "help" command before my patchset
* 'help -a' gives out help of all commands
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-13 08:28:42 +00:00
|
|
|
BAREBOX_CMD_DESC("list information about magic variables")
|
2014-11-06 08:05:54 +00:00
|
|
|
BAREBOX_CMD_OPTS("[-va]")
|
2014-05-15 09:08:56 +00:00
|
|
|
BAREBOX_CMD_HELP(cmd_magicvar_help)
|
commands: group 'help' output
The old output of "help" was just producing a long list, that usually
scrolled of the screen (even on a X11 terminal). This list is more
compact, and also sorted by groups.
The old output format (plus grouping) is now available with 'help -v'.
Example:
Information commands:
?, devinfo, help, iomem, meminfo, version
Boot commands:
boot, bootm, go, loadb, loads, loadx, loady, saves, uimage
...
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-05-13 14:14:05 +00:00
|
|
|
BAREBOX_CMD_GROUP(CMD_GRP_ENV)
|
2011-11-26 20:33:59 +00:00
|
|
|
BAREBOX_CMD_END
|