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

Fix command-line tty-device|config parsing

Browse source 
Allow user to add options on both sides of the provided config argument.

For example:

 $ tio -b 9600 am64-evm -e

Before, tio only allowed adding arguments after the config argument.

Implemented as simple as possible by introducing two stage option parsing.
This commit is contained in:
Martin Lund 2022-06-11 22:55:56 +02:00
parent bd5f542959
commit a0d4be068b
5 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/configfile.c
View file

@ -275,10 +275,9 @@ static int resolve_config_file(void)
return -EINVAL;
}
void config_file_parse(const int argc, char *argv[])
void config_file_parse(void)
{
int ret;
int i;
c = malloc(sizeof(struct config_t));
memset(c, 0, sizeof(struct config_t));
@ -290,14 +289,8 @@ void config_file_parse(const int argc, char *argv[])
return;
}
for (i = 1; i < argc; i++)
{
if (argv[i][0] != '-')
{
c->user = argv[i];
break;
}
}
// Set user input which may be tty device or sub config
c->user = option.tty_device;
if (!c->user)
{
@ -333,6 +326,8 @@ void config_file_parse(const int argc, char *argv[])
fprintf(stderr, "Error: Unable to parse configuration file (%d)", ret);
exit(EXIT_FAILURE);
}
atexit(&config_exit);
}
void config_exit(void)
@ -350,7 +345,7 @@ void config_exit(void)
free(c);
}
void config_file_print()
void config_file_print(void)
{
if (c->path != NULL)
{