Github
/
FTL
mirror of
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add quiet CLI config mode (e.g., "pihole-FTL --config -q dns.blocking.active") which makes boolean values accessible via FTL's return code 

Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2023-02-05 17:23:47 +01:00
parent 8f33706743
commit 501455e76e
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/args.c
View File

@ -239,9 +239,11 @@ void parse_args(int argc, char* argv[])
log_ctrl(false, true);
set_all_debug(false);
if(argc == 3)
exit(get_config_from_CLI(argv[2]) ? EXIT_SUCCESS : EXIT_FAILURE);
exit(get_config_from_CLI(argv[2], false));
else if(argc == 4 && strcmp(argv[2], "-q") == 0)
exit(get_config_from_CLI(argv[3], true));
else if(argc == 4)
exit(set_config_from_CLI(argv[2], argv[3]) ? EXIT_SUCCESS : EXIT_FAILURE);
exit(set_config_from_CLI(argv[2], argv[3]));
else
{
printf("Usage: %s --config <config item key> [<value>]\n", argv[0]);

19
src/config/cli.c
View File

@ -288,7 +288,7 @@ static bool readStringValue(struct conf_item *conf_item, const char *value)
return true;
}
bool set_config_from_CLI(const char *key, const char *value)
int set_config_from_CLI(const char *key, const char *value)
{
// Identify config option
struct config newconf;
@ -317,7 +317,7 @@ bool set_config_from_CLI(const char *key, const char *value)
if(new_item == NULL)
{
log_err("Unknown config option: %s", key);
return false;
return 2;
}
// Parse value
@ -337,7 +337,7 @@ bool set_config_from_CLI(const char *key, const char *value)
{
// Test failed
log_debug(DEBUG_CONFIG, "Config item %s: dnsmasq config test failed", conf_item->k);
return false;
return 3;
}
}
else if(conf_item == &config.dns.hosts)
@ -367,10 +367,10 @@ bool set_config_from_CLI(const char *key, const char *value)
putchar('\n');
writeFTLtoml(false);
return true;
return EXIT_SUCCESS;
}
bool get_config_from_CLI(const char *key)
int get_config_from_CLI(const char *key, const bool quiet)
{
// Identify config option
struct conf_item *conf_item = NULL;
@ -391,12 +391,17 @@ bool get_config_from_CLI(const char *key)
if(conf_item == NULL)
{
log_err("Unknown config option: %s", key);
return false;
return 2;
}
// Use return status if this is a boolean value
// and we are in quiet mode
if(quiet && conf_item->t == CONF_BOOL)
return conf_item->v.b ? EXIT_SUCCESS : EXIT_FAILURE;
// Print value
writeTOMLvalue(stdout, -1, conf_item->t, &conf_item->v);
putchar('\n');
return true;
return EXIT_SUCCESS;
}

4
src/config/cli.h
View File

@ -10,7 +10,7 @@
#ifndef CONFIG_CLI_H
#define CONFIG_CLI_H
bool set_config_from_CLI(const char *key, const char *value);
bool get_config_from_CLI(const char *key);
int set_config_from_CLI(const char *key, const char *value);
int get_config_from_CLI(const char *key, const bool quiet);
#endif //CONFIG_CLI_H