From nobody Tue Feb 10 04:16:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576686410; cv=none; d=zohomail.com; s=zohoarc; b=GTHQDFNi2xG7cp1lyUuolwtl+L02laLJekx4WyPjcw3gFA93vSHB/HdXQTVoTEOdPpu3aw94wQz51JCPCIN4SbXUA/xwcvwqwqAurwCs7Mt1mmQ99HQMcHP4WN4YvxnZb9PNBwNLtFlJifKBKKXLQb8vzYI2EPjjFXeQ/RKnFBU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576686410; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/iTl8TsCEzmjta/vvutYD3c352RU92nIBZK47wDAZQo=; b=JzqGDzqjVSvSIIjfPa0iWaFkr5GRfrmgGGP+j4TsXgQvPR299s7zZ1h+0tMF+gsRX0jeoXv91WbjzWs3dGMRvY487adl37UYUR8vi4CY2scpqwEvNWNRom7wFtEjjkr6dI7/rX7raPTL8te8Ayvkb+sb7AXM80bxSuWwXN9T7d8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1576686410272123.7403548814184; Wed, 18 Dec 2019 08:26:50 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-270-1U7sEVqNPgOAk1cY98TBUw-1; Wed, 18 Dec 2019 11:26:47 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7673FDBA9; Wed, 18 Dec 2019 16:26:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 48B776025F; Wed, 18 Dec 2019 16:26:41 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 027751803C40; Wed, 18 Dec 2019 16:26:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xBIGQShY012503 for ; Wed, 18 Dec 2019 11:26:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id 832FA5C28D; Wed, 18 Dec 2019 16:26:28 +0000 (UTC) Received: from laerte.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id D62945C1D4; Wed, 18 Dec 2019 16:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576686408; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/iTl8TsCEzmjta/vvutYD3c352RU92nIBZK47wDAZQo=; b=bJh9d0P7XKiocBu9S6UiWpnLnMGTL3/rxOrLtJx/nU7rfaOjDYh2KVSOr3o8QB4RvAnLkn 1hfDCY2mSFdQ1Z4TiXP6aKtvov97PPKUyVWoUWiwkdLp+V0vRmiZzWmH7spng9Iq0eRKkQ 3kCvWGoIg66zS5RAH0KrWmsSRdFOlOU= From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Wed, 18 Dec 2019 17:26:14 +0100 Message-Id: <20191218162614.1639879-5-fidencio@redhat.com> In-Reply-To: <20191218162614.1639879-1-fidencio@redhat.com> References: <20191218162614.1639879-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [PATCH v4 4/4] util: Rewrite virGetUserRuntimeDirectory() using g_get_user_runtime_dir() X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: 1U7sEVqNPgOAk1cY98TBUw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Fabiano Fid=C3=AAncio --- src/util/virutil.c | 39 ++++++++++----------------------------- 1 file changed, 10 insertions(+), 29 deletions(-) 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) } =20 =20 +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 @qui= et, @@ -756,20 +766,6 @@ char *virGetUserShell(uid_t uid) } =20 =20 -char *virGetUserRuntimeDirectory(void) -{ - const char *path =3D getenv("XDG_RUNTIME_DIR"); - - if (!path || !path[0]) { - return virGetUserCacheDirectory(); - } else { - char *ret; - - ret =3D 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; } =20 -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) =20 return NULL; } - -char * -virGetUserRuntimeDirectory(void) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("virGetUserRuntimeDirectory is not available")); - - return NULL; -} # endif /* ! HAVE_GETPWUID_R && ! WIN32 */ =20 char * --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list