From: Fabiano Fidêncio <fidencio@redhat.com>
Date: Tue, 17 Dec 2019 15:42:09 +0000 (+0100)
Subject: util: Rewrite virGetUserRuntimeDirectory() using g_get_user_runtime_dir()
X-Git-Tag: v6.0.0-rc1~201
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5742d4c018c9ee9077bd8c06732214bf26cc6959;p=thirdparty%2Flibvirt.git

util: Rewrite virGetUserRuntimeDirectory() using g_get_user_runtime_dir()

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
---

diff --git a/src/util/virutil.c b/src/util/virutil.c
index db9378fa57..a28feb3daa 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -606,6 +606,16 @@ char *virGetUserCacheDirectory(void)
 }
 
 
+char *virGetUserRuntimeDirectory(void)
+{
+#ifdef WIN32
+    return g_strdup(g_get_user_runtime_dir());
+#else
+    return g_build_filename(g_get_user_runtime_dir(), "libvirt", NULL);
+#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,
@@ -756,20 +766,6 @@ char *virGetUserShell(uid_t uid)
 }
 
 
-char *virGetUserRuntimeDirectory(void)
-{
-    const char *path = getenv("XDG_RUNTIME_DIR");
-
-    if (!path || !path[0]) {
-        return virGetUserCacheDirectory();
-    } else {
-        char *ret;
-
-        ret = g_strdup_printf("%s/libvirt", path);
-        return ret;
-    }
-}
-
 char *virGetUserName(uid_t uid)
 {
     char *ret;
@@ -1179,12 +1175,6 @@ virGetUserShell(uid_t uid G_GNUC_UNUSED)
     return NULL;
 }
 
-char *
-virGetUserRuntimeDirectory(void)
-{
-    return virGetUserCacheDirectory();
-}
-
 # else /* !HAVE_GETPWUID_R && !WIN32 */
 char *
 virGetUserDirectoryByUID(uid_t uid G_GNUC_UNUSED)
@@ -1203,15 +1193,6 @@ virGetUserShell(uid_t uid G_GNUC_UNUSED)
 
     return NULL;
 }
-
-char *
-virGetUserRuntimeDirectory(void)
-{
-    virReportError(VIR_ERR_INTERNAL_ERROR,
-                   "%s", _("virGetUserRuntimeDirectory is not available"));
-
-    return NULL;
-}
 # endif /* ! HAVE_GETPWUID_R && ! WIN32 */
 
 char *