lagertonne/ifupdown-ng
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Wiki Activity

ifparse: use -F to select output format instead of individual output options

Browse source
This commit is contained in:
Ariadne Conill 2020-11-13 21:52:17 -07:00
parent d2a75c7bb4
commit 545c3870ab
1 changed files with 34 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
cmd/ifparse.c
View file

@ -47,24 +47,18 @@ set_allow_undefined(const char *arg)
allow_undefined = true; allow_undefined = true;
} }
#ifdef CONFIG_YAML static const char *output_fmt = "ifupdown";
static bool use_yaml = false;
static void static void
set_yaml(const char *arg) set_output_fmt(const char *arg)
{ {
(void) arg; output_fmt = arg;
use_yaml = true;
} }
#endif
static struct if_option local_options[] = { static struct if_option local_options[] = {
{'F', "format", NULL, "output format to use", true, set_output_fmt},
{'A', "all", NULL, "show all interfaces", false, set_show_all}, {'A', "all", NULL, "show all interfaces", false, set_show_all},
{'U', "allow-undefined", NULL, "allow querying undefined (virtual) interfaces", false, set_allow_undefined}, {'U', "allow-undefined", NULL, "allow querying undefined (virtual) interfaces", false, set_allow_undefined},
#ifdef CONFIG_YAML
{'Y', "yaml-raw", NULL, "reflect raw {iface, key, value} triples as YAML", false, set_yaml},
#endif
}; };
static struct if_option_group local_option_group = { static struct if_option_group local_option_group = {
@ -116,6 +110,27 @@ prettyprint_interface_yaml(struct lif_interface *iface)
} }
#endif #endif
struct prettyprint_impl_map {
const char *name;
void (*handle)(struct lif_interface *iface);
};
struct prettyprint_impl_map pp_impl_map[] = {
{"ifupdown", prettyprint_interface_eni},
#ifdef CONFIG_YAML
{"yaml-raw", prettyprint_interface_yaml},
#endif
};
static int
pp_impl_cmp(const void *a, const void *b)
{
const char *key = a;
const struct prettyprint_impl_map *impl = b;
return strcmp(key, impl->name);
}
int int
ifparse_main(int argc, char *argv[]) ifparse_main(int argc, char *argv[])
{ {
@ -151,6 +166,13 @@ ifparse_main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
struct prettyprint_impl_map *m = bsearch(output_fmt, pp_impl_map, ARRAY_SIZE(pp_impl_map), sizeof(*m), pp_impl_cmp);
if (m == NULL)
{
fprintf(stderr, "%s: %s: output format not supported\n", argv0, output_fmt);
return EXIT_FAILURE;
}
if (show_all) if (show_all)
{ {
struct lif_node *n; struct lif_node *n;
@ -159,12 +181,7 @@ ifparse_main(int argc, char *argv[])
{ {
struct lif_dict_entry *entry = n->data; struct lif_dict_entry *entry = n->data;
#ifdef CONFIG_YAML m->handle(entry->data);
if (use_yaml)
prettyprint_interface_yaml(entry->data);
else
#endif
prettyprint_interface_eni(entry->data);
} }
return EXIT_SUCCESS; return EXIT_SUCCESS;
@ -191,12 +208,7 @@ ifparse_main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
#ifdef CONFIG_YAML m->handle(iface);
if (use_yaml)
prettyprint_interface_yaml(entry->data);
else
#endif
prettyprint_interface_eni(iface);
} }
return EXIT_SUCCESS; return EXIT_SUCCESS;