Maarrk/tio
1
0
Fork 0
mirror of https://github.com/tio/tio.git synced 2026-05-01 23:07:58 +02:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #181 from vpatkov/master

Browse source 
Better error checking in config file, rename the file
This commit is contained in:
Martin Lund 2022-12-06 18:37:55 +01:00 • committed by GitHub
commit 20a40edd36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 72 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

6
man/tio.1.in
View file

@ -332,11 +332,9 @@ the configuration file first found in the following locations in the order
listed: listed:
.PP .PP
.I $XDG_CONFIG_HOME/tio/tiorc .I $XDG_CONFIG_HOME/tio/config
.PP .PP
.I $HOME/.config/tio/tiorc .I $HOME/.config/tio/config
.PP
.I $HOME/.tiorc
.PP .PP
Labels can be used to group settings into named sub-configurations which can be Labels can be used to group settings into named sub-configurations which can be

167
src/configfile.c
View file

@ -98,6 +98,40 @@ static int get_match(const char *input, const char *pattern, char **match)
return len; return len;
} }
static bool read_boolean(const char *value, const char *name)
{
const char *true_values[] = { "true", "enable", "on", "yes", "1", NULL };
const char *false_values[] = { "false", "disable", "off", "no", "0", NULL };
for (int i = 0; true_values[i] != NULL; i++)
if (strcmp(value, true_values[i]) == 0)
return true;
for (int i = 0; false_values[i] != NULL; i++)
if (strcmp(value, false_values[i]) == 0)
return false;
tio_error_printf("Invalid value '%s' for option '%s' in configuration file",
value, name);
exit(EXIT_FAILURE);
}
static long read_integer(const char *value, const char *name, long min_value, long max_value)
{
errno = 0;
char *endptr;
long result = strtol(value, &endptr, 10);
if (errno || endptr == value || *endptr != '\0' || result < min_value || result > max_value)
{
tio_error_printf("Invalid value '%s' for option '%s' in configuration file",
value, name);
exit(EXIT_FAILURE);
}
return result;
}
/** /**
* data_handler() - walk config file to load parameters matching user input * data_handler() - walk config file to load parameters matching user input
* *
@ -119,11 +153,11 @@ static int data_handler(void *user, const char *section, const char *name,
} }
else if (!strcmp(name, "baudrate")) else if (!strcmp(name, "baudrate"))
{ {
option.baudrate = string_to_long((char *)value); option.baudrate = read_integer(value, name, 0, LONG_MAX);
} }
else if (!strcmp(name, "databits")) else if (!strcmp(name, "databits"))
{ {
option.databits = atoi(value); option.databits = read_integer(value, name, 5, 8);
} }
else if (!strcmp(name, "flow")) else if (!strcmp(name, "flow"))
{ {
@ -132,7 +166,7 @@ static int data_handler(void *user, const char *section, const char *name,
} }
else if (!strcmp(name, "stopbits")) else if (!strcmp(name, "stopbits"))
{ {
option.stopbits = atoi(value); option.stopbits = read_integer(value, name, 1, 2);
} }
else if (!strcmp(name, "parity")) else if (!strcmp(name, "parity"))
{ {
@ -141,11 +175,11 @@ static int data_handler(void *user, const char *section, const char *name,
} }
else if (!strcmp(name, "output-delay")) else if (!strcmp(name, "output-delay"))
{ {
option.output_delay = atoi(value); option.output_delay = read_integer(value, name, 0, LONG_MAX);
} }
else if (!strcmp(name, "output-line-delay")) else if (!strcmp(name, "output-line-delay"))
{ {
option.output_line_delay = atoi(value); option.output_line_delay = read_integer(value, name, 0, LONG_MAX);
} }
else if (!strcmp(name, "line-pulse-duration")) else if (!strcmp(name, "line-pulse-duration"))
{ {
@ -153,25 +187,11 @@ static int data_handler(void *user, const char *section, const char *name,
} }
else if (!strcmp(name, "no-autoconnect")) else if (!strcmp(name, "no-autoconnect"))
{ {
if (!strcmp(value, "enable")) option.no_autoconnect = read_boolean(value, name);
{
option.no_autoconnect = true;
}
else if (!strcmp(value, "disable"))
{
option.no_autoconnect = false;
}
} }
else if (!strcmp(name, "log")) else if (!strcmp(name, "log"))
{ {
if (!strcmp(value, "enable")) option.log = read_boolean(value, name);
{
option.log = true;
}
else if (!strcmp(value, "disable"))
{
option.log = false;
}
} }
else if (!strcmp(name, "log-file")) else if (!strcmp(name, "log-file"))
{ {
@ -180,47 +200,20 @@ static int data_handler(void *user, const char *section, const char *name,
} }
else if (!strcmp(name, "log-strip")) else if (!strcmp(name, "log-strip"))
{ {
if (!strcmp(value, "enable")) option.log_strip = read_boolean(value, name);
{
option.log_strip = true;
}
else if (!strcmp(value, "disable"))
{
option.log_strip = false;
}
} }
else if (!strcmp(name, "local-echo")) else if (!strcmp(name, "local-echo"))
{ {
if (!strcmp(value, "enable")) option.local_echo = read_boolean(value, name);
{
option.local_echo = true;
}
else if (!strcmp(value, "disable"))
{
option.local_echo = false;
}
} }
else if (!strcmp(name, "hexadecimal")) else if (!strcmp(name, "hexadecimal"))
{ {
if (!strcmp(value, "enable")) option.hex_mode = read_boolean(value, name);
{
option.hex_mode = true;
}
else if (!strcmp(value, "disable"))
{
option.hex_mode = false;
}
} }
else if (!strcmp(name, "timestamp")) else if (!strcmp(name, "timestamp"))
{ {
if (!strcmp(value, "enable")) option.timestamp = read_boolean(value, name) ?
{ TIMESTAMP_24HOUR : TIMESTAMP_NONE;
option.timestamp = TIMESTAMP_24HOUR;
}
else if (!strcmp(value, "disable"))
{
option.timestamp = TIMESTAMP_NONE;
}
} }
else if (!strcmp(name, "timestamp-format")) else if (!strcmp(name, "timestamp-format"))
{ {
@ -270,29 +263,15 @@ static int data_handler(void *user, const char *section, const char *name,
} }
else if (!strcmp(name, "response-wait")) else if (!strcmp(name, "response-wait"))
{ {
if (!strcmp(value, "enable")) option.response_wait = read_boolean(value, name);
{
option.response_wait = true;
}
else if (!strcmp(value, "disable"))
{
option.response_wait = false;
}
} }
else if (!strcmp(name, "response-timeout")) else if (!strcmp(name, "response-timeout"))
{ {
option.response_timeout = atoi(value); option.response_timeout = read_integer(value, name, 0, LONG_MAX);
} }
else if (!strcmp(name, "rs-485")) else if (!strcmp(name, "rs-485"))
{ {
if (!strcmp(value, "enable")) option.rs485 = read_boolean(value, name);
{
option.rs485 = true;
}
else if (!strcmp(value, "disable"))
{
option.rs485 = false;
}
} }
else if (!strcmp(name, "rs-485-config")) else if (!strcmp(name, "rs-485-config"))
{ {
@ -304,14 +283,11 @@ static int data_handler(void *user, const char *section, const char *name,
} }
else if (!strcmp(name, "mute")) else if (!strcmp(name, "mute"))
{ {
if (!strcmp(value, "enable")) option.mute = read_boolean(value, name);
{ }
option.mute = true; else
} {
else if (!strcmp(value, "disable")) tio_warning_printf("Unknown option '%s' in configuration file, ignored", name);
{
option.mute = false;
}
} }
} }
@ -389,32 +365,29 @@ static int section_name_print_handler(void *user, const char *section, const cha
static int resolve_config_file(void) static int resolve_config_file(void)
{ {
asprintf(&c.path, "%s/tio/tiorc", getenv("XDG_CONFIG_HOME")); char *xdg = getenv("XDG_CONFIG_HOME");
if (!access(c.path, F_OK)) if (xdg)
{ {
return 0; asprintf(&c.path, "%s/tio/config", xdg);
if (access(c.path, F_OK) == 0)
{
return 0;
}
free(c.path);
} }
free(c.path); char *home = getenv("HOME");
if (home)
asprintf(&c.path, "%s/.config/tio/tiorc", getenv("HOME"));
if (!access(c.path, F_OK))
{ {
return 0; asprintf(&c.path, "%s/.config/tio/config", home);
if (access(c.path, F_OK) == 0)
{
return 0;
}
free(c.path);
} }
free(c.path);
asprintf(&c.path, "%s/.tiorc", getenv("HOME"));
if (!access(c.path, F_OK))
{
return 0;
}
free(c.path);
c.path = NULL; c.path = NULL;
return -EINVAL; return -EINVAL;
} }