From d05b3963381a4cd0329bced938d79a23bb392658 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Thu, 26 Oct 2023 15:00:30 +0000 Subject: Some more fixes Signed-off-by: Laurent Bercot --- src/libtipidee/tipidee_conf_get_redirection.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/libtipidee') diff --git a/src/libtipidee/tipidee_conf_get_redirection.c b/src/libtipidee/tipidee_conf_get_redirection.c index 9d40de2..b117481 100644 --- a/src/libtipidee/tipidee_conf_get_redirection.c +++ b/src/libtipidee/tipidee_conf_get_redirection.c @@ -11,19 +11,20 @@ static int get_redir (tipidee_conf const *conf, size_t minl, char *key, size_t l, char const *path, tipidee_redirection *r) { - char const *v ; + char const *v = 0 ; key[0] = 'R' ; key[l] = '/' ; - for (;;) + errno = ENOENT ; + while (!v) { - while (l > minl && key[l] != '/') l-- ; - if (l <= minl) return 0 ; + if (errno != ENOENT) return -1 ; + while (l >= minl && key[l] != '/') l-- ; + if (l < minl) break ; key[l--] = 0 ; v = tipidee_conf_get_string(conf, key) ; - if (v) break ; - if (errno != ENOENT) return -1 ; key[0] = 'r' ; } + if (!v) return 0 ; if (v[0] < '@' || v[0] > 'C') return (errno = EPROTO, -1) ; r->type = v[0] & ~'@' ; r->location = v+1 ; -- cgit v1.3.1