From fa944345a63a083555a1f1933aabf4ea6f27a307 Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Tue, 5 Oct 2021 23:16:32 -0400 Subject: Refactor XDG base directory iterator API Finally something more reasonable for call sites. --- local.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'local.c') diff --git a/local.c b/local.c index 35286b3..ece94ca 100644 --- a/local.c +++ b/local.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -52,24 +53,22 @@ int localConfig( if (!config) errx(EX_SOFTWARE, "tls_config_new"); int error; - const char *dirs = NULL; - for (const char *path; NULL != (path = configPath(&dirs, cert));) { - error = tls_config_set_cert_file(config, path); + char buf[PATH_MAX]; + for (int i = 0; configPath(buf, sizeof(buf), cert, i); ++i) { + error = tls_config_set_cert_file(config, buf); if (!error) break; } if (error) goto fail; - dirs = NULL; - for (const char *path; NULL != (path = configPath(&dirs, priv));) { - error = tls_config_set_key_file(config, path); + for (int i = 0; configPath(buf, sizeof(buf), priv, i); ++i) { + error = tls_config_set_key_file(config, buf); if (!error) break; } if (error) goto fail; if (ca) { - dirs = NULL; - for (const char *path; NULL != (path = configPath(&dirs, ca));) { - error = tls_config_set_ca_file(config, path); + for (int i = 0; configPath(buf, sizeof(buf), ca, i); ++i) { + error = tls_config_set_ca_file(config, buf); if (!error) break; } if (error) goto fail; -- cgit 1.4.1