From d81fda45a794bd7c8c696219a8fcd20a5e0a8311 Mon Sep 17 00:00:00 2001 From: Alex 'AdUser' Z Date: Fri, 23 Aug 2024 12:01:36 +1000 Subject: [PATCH] * source/files : use 'flexible array' for init string in config struct --- src/sources/files.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/sources/files.c b/src/sources/files.c index 0a572b2..0e717a3 100644 --- a/src/sources/files.c +++ b/src/sources/files.c @@ -32,7 +32,7 @@ struct _config { f2b_file_t *current; int flags; bool missingok; - char path[256]; + char path[]; }; #include "source.c" @@ -88,7 +88,7 @@ file_rotated(const cfg_t *cfg, f2b_file_t *file) { return true; if (stat(file->path, &st) != 0) { - log_msg(cfg, error, "file stat error: %s", strerror(errno)); + log_msg(cfg, error, "stat(): %s -- %s", file->path, strerror(errno)); return true; } @@ -130,15 +130,21 @@ file_getline(const cfg_t *cfg, f2b_file_t *file, char *buf, size_t bufsize) { cfg_t * create(const char *init) { cfg_t *cfg = NULL; - if ((cfg = calloc(1, sizeof(cfg_t))) == NULL) + + if (init == NULL) return NULL; + + size_t ilen = strlen(init) + 1; + if (ilen <= 1) return NULL; + + if ((cfg = calloc(1, sizeof(cfg_t) + ilen)) == NULL) return NULL; - cfg->logcb = &logcb_stub; cfg->flags |= MOD_TYPE_SOURCE; cfg->flags |= MOD_NEED_FILTER; - if (init != NULL && strlen(init) > 0) { - strlcpy(cfg->path, init, sizeof(cfg->path)); - cfg->flags |= MOD_IS_READY; - } + + cfg->logcb = &logcb_stub; + strlcpy(cfg->path, init, ilen); + cfg->flags |= MOD_IS_READY; + return cfg; }