lib/path: allow dir-path formatting
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
parent
91d28f5986
commit
83bbeb77c1
|
@ -21,7 +21,7 @@ struct path_cxt {
|
|||
int (*redirect_on_enoent)(struct path_cxt *, const char *, int *);
|
||||
};
|
||||
|
||||
struct path_cxt *ul_new_path(const char *dir);
|
||||
struct path_cxt *ul_new_path(const char *dir, ...);
|
||||
void ul_unref_path(struct path_cxt *pc);
|
||||
void ul_ref_path(struct path_cxt *pc);
|
||||
|
||||
|
|
12
lib/path.c
12
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;
|
||||
|
|
Loading…
Reference in New Issue