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 parsing of timestamp options

Browse source
This commit is contained in:
Martin Lund 2025-02-15 19:50:52 +01:00
parent 8f7bf2fd2c
commit 6831ad0eae
2 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/configfile.c
View file

@ -31,6 +31,7 @@
#include <regex.h> #include <regex.h>
#include <glib.h> #include <glib.h>
#include "configfile.h" #include "configfile.h"
#include "timestamp.h"
#include "print.h" #include "print.h"
#include "rs485.h" #include "rs485.h"
#include "misc.h" #include "misc.h"
@ -148,7 +149,6 @@ static void config_get_bool(GKeyFile *key_file, gchar *group, gchar *key, bool *
static void config_parse_keys(GKeyFile *key_file, char *group) static void config_parse_keys(GKeyFile *key_file, char *group)
{ {
char *string = NULL; char *string = NULL;
bool boolean = false;
config_get_string(key_file, group, "device", &config.device, NULL); config_get_string(key_file, group, "device", &config.device, NULL);
config_get_integer(key_file, group, "baudrate", &option.baudrate, 0, INT_MAX); config_get_integer(key_file, group, "baudrate", &option.baudrate, 0, INT_MAX);
@ -204,17 +204,16 @@ static void config_parse_keys(GKeyFile *key_file, char *group)
g_free((void *)string); g_free((void *)string);
string = NULL; string = NULL;
} }
config_get_bool(key_file, group, "timestamp", &boolean); config_get_bool(key_file, group, "timestamp", (bool*) &option.timestamp);
if (boolean == true) if (option.timestamp != TIMESTAMP_NONE)
{ {
option.timestamp = TIMESTAMP_24HOUR; config_get_string(key_file, group, "timestamp-format", &string, "24hour", "24hour-start", "24hour-delta", "iso8601", "epoch", NULL);
} if (string != NULL)
config_get_string(key_file, group, "timestamp-format", &string, "24hour", "24hour-start", "24hour-delta", "iso8601", "epoch", NULL); {
if (string != NULL) option_parse_timestamp(string, &option.timestamp);
{ g_free((void *)string);
option_parse_timestamp(string, &option.timestamp); string = NULL;
g_free((void *)string); }
string = NULL;
} }
config_get_integer(key_file, group, "timestamp-timeout", &option.timestamp_timeout, 0, INT_MAX); config_get_integer(key_file, group, "timestamp-timeout", &option.timestamp_timeout, 0, INT_MAX);
config_get_bool(key_file, group, "log", &option.log); config_get_bool(key_file, group, "log", &option.log);

5
src/options.c
View file

@ -998,7 +998,10 @@ void options_parse(int argc, char *argv[])
break; break;
case 't': case 't':
option.timestamp = TIMESTAMP_24HOUR; if (option.timestamp == TIMESTAMP_NONE)
{
option.timestamp = TIMESTAMP_24HOUR;
}
break; break;
case OPT_TIMESTAMP_FORMAT: case OPT_TIMESTAMP_FORMAT: