From 83bbeb77c1e64b02ad5f36bde47d22be69d08a0f Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 21 Jun 2018 13:49:03 +0200 Subject: lib/path: allow dir-path formatting Signed-off-by: Karel Zak --- lib/path.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/path.c b/lib/path.c index 602674956..34abb144a 100644 --- a/lib/path.c +++ b/lib/path.c @@ -48,7 +48,7 @@ void ul_path_init_debug(void) __UL_INIT_DEBUG_FROM_ENV(ulpath, ULPATH_DEBUG_, 0, ULPATH_DEBUG); } -struct path_cxt *ul_new_path(const char *dir) +struct path_cxt *ul_new_path(const char *dir, ...) { struct path_cxt *pc = calloc(1, sizeof(*pc)); @@ -61,8 +61,14 @@ struct path_cxt *ul_new_path(const char *dir) pc->dir_fd = -1; if (dir) { - pc->dir_path = strdup(dir); - if (!pc->dir_path) + int rc; + va_list ap; + + va_start(ap, dir); + rc = vasprintf(&pc->dir_path, dir, ap); + va_end(ap); + + if (rc < 0 || !pc->dir_path) goto fail; } return pc; -- cgit v1.2.3-55-g7522