From 702d2d54a3056b41dd16f2c5d4964d5c2947e85c Mon Sep 17 00:00:00 2001 From: Philip Meulengracht Date: Fri, 14 Feb 2025 08:50:52 +0100 Subject: [PATCH] libs: update vafs and fix build issue in dirs-linux.c --- libs/dirconf/dirs-linux.c | 9 +++++++-- libs/vafs | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/dirconf/dirs-linux.c b/libs/dirconf/dirs-linux.c index 9599f53..20eac39 100644 --- a/libs/dirconf/dirs-linux.c +++ b/libs/dirconf/dirs-linux.c @@ -193,8 +193,7 @@ static char* __root_common_user_directory(void) #endif status = platform_getuserdir(&buffer[0], sizeof(buffer) - 1); if (status) { - VLOG_ERROR("dirs", "failed to resolve user directory\n"); - return -1; + return NULL; } return strpathcombine(&buffer[0], ".chef"); } @@ -221,7 +220,13 @@ int chef_dirs_initialize(void) } g_dirs.real_user = realUser; + g_dirs.root = __root_common_user_directory(); + if (g_dirs.root == NULL) { + VLOG_ERROR("dirs", "failed to resolve user directory\n"); + return -1; + } + g_dirs.fridge = strpathcombine(g_dirs.root, "fridge"); g_dirs.store = strpathcombine(g_dirs.root, "store"); g_dirs.kitchen = strpathcombine(g_dirs.root, "kitchen"); diff --git a/libs/vafs b/libs/vafs index f07d575..5eac9ee 160000 --- a/libs/vafs +++ b/libs/vafs @@ -1 +1 @@ -Subproject commit f07d575a0c62f27d1f5103c39139f2f8a6eb48de +Subproject commit 5eac9eebd7d2b19a15e6d7e0921c706208e777a1