[libvirt] [PATCH v3 3/4] util: Rewrite virGetUserCacheDirectory() using g_get_user_cache_dir()
Signed-off-by: Fabiano Fidêncio <fidencio(a)redhat.com>
---
src/util/virutil.c | 57 ++++++++--------------------------------------
1 file changed, 10 insertions(+), 47 deletions(-)
diff --git a/src/util/virutil.c b/src/util/virutil.c
index 1bcdde9ad6..2e8b4e95b7 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -596,6 +596,16 @@ char *virGetUserConfigDirectory(void)
}
+char *virGetUserCacheDirectory(void)
+{
+#ifdef WIN32
+ return g_strdup(g_get_user_cache_dir());
+#else
+ return g_strdup_printf("%s/libvirt", g_get_user_cache_dir());
+#endif
+}
+
+
#ifdef HAVE_GETPWUID_R
/* Look up fields from the user database for the given user. On
* error, set errno, report the error if not instructed otherwise via @quiet,
@@ -746,29 +756,6 @@ char *virGetUserShell(uid_t uid)
}
-static char *virGetXDGDirectory(const char *xdgenvname, const char *xdgdefdir)
-{
- const char *path = getenv(xdgenvname);
- char *ret = NULL;
- char *home = NULL;
-
- if (path && path[0]) {
- ret = g_strdup_printf("%s/libvirt", path);
- } else {
- home = virGetUserDirectory();
- if (home)
- ret = g_strdup_printf("%s/%s/libvirt", home, xdgdefdir);
- }
-
- VIR_FREE(home);
- return ret;
-}
-
-char *virGetUserCacheDirectory(void)
-{
- return virGetXDGDirectory("XDG_CACHE_HOME", ".cache");
-}
-
char *virGetUserRuntimeDirectory(void)
{
const char *path = getenv("XDG_RUNTIME_DIR");
@@ -1192,21 +1179,6 @@ virGetUserShell(uid_t uid G_GNUC_UNUSED)
return NULL;
}
-char *
-virGetUserCacheDirectory(void)
-{
- char *ret;
- if (virGetWin32SpecialFolder(CSIDL_INTERNET_CACHE, &ret) < 0)
- return NULL;
-
- if (!ret) {
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
- _("Unable to determine config directory"));
- return NULL;
- }
- return ret;
-}
-
char *
virGetUserRuntimeDirectory(void)
{
@@ -1232,15 +1204,6 @@ virGetUserShell(uid_t uid G_GNUC_UNUSED)
return NULL;
}
-char *
-virGetUserCacheDirectory(void)
-{
- virReportError(VIR_ERR_INTERNAL_ERROR,
- "%s", _("virGetUserCacheDirectory is not
available"));
-
- return NULL;
-}
-
char *
virGetUserRuntimeDirectory(void)
{
--
2.23.0