From nobody Sun Apr 28 13:45:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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=1576597912; cv=none; d=zohomail.com; s=zohoarc; b=i6TnmwzSbnm+rWG/3l5YhcIsrM7i3M7E2MhFKzTlgiecPH1OqL2PaTLNWIbmIU6nW51My19r2Ym1yk0A5pIlhQMwVL2q98oGBGSLHpD2GrIkt3+8iK2U7TrtJf85upuHEBMtvtLzUB39owDdCbMJG0lntxH+RiZld4IDRY3X32A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576597912; 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=OBfVpxvQ9b5dyAeE4HzR44FdBy3HCL7RQdbbObWl5tY=; b=OQBH1Elu7EWeeaLTnPxF+1/poFcvy1DCsPMvmW2Y+g+TFf2PUpjqpExOFfoiRkxDSdmJtsp4q9wReM0lArwKlf250bqiNUabAHwgOmnpoevWNs9XF2pGRFi7T6blbp9oEb3xT8RkXE1iHVAw8MdsFW1bVqBYNHkkpSDh2zaknD4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1576597912689872.143242660309; Tue, 17 Dec 2019 07:51:52 -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-340-WNLxLchKMjmW-Ce12Idhzw-1; Tue, 17 Dec 2019 10:51:49 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 59A4B85C710; Tue, 17 Dec 2019 15:51:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2259610016E8; Tue, 17 Dec 2019 15:51:42 +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 7EEF4104858; Tue, 17 Dec 2019 15:51:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xBHFpdgl028596 for ; Tue, 17 Dec 2019 10:51:39 -0500 Received: by smtp.corp.redhat.com (Postfix) id DA9F160933; Tue, 17 Dec 2019 15:51:39 +0000 (UTC) Received: from laerte.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A3AAA4B60; Tue, 17 Dec 2019 15:51:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576597911; 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=OBfVpxvQ9b5dyAeE4HzR44FdBy3HCL7RQdbbObWl5tY=; b=QNluRxPbFD5/nQiF5WBRReomqytt2rCLFNWpzgtpQe49D9DKd7m8f+9Mhyl2Lul0ABwvW3 gJMYGjfGzgihixtohPfIjsazU5u4iGiNS41Qo6LHqpkcTrXJEpoVlmza45SqZG54sqPvvR UT08sMv3SB6xDiMnh5BZWANHqqBUPvQ= From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Tue, 17 Dec 2019 16:51:29 +0100 Message-Id: <20191217155132.711335-2-fidencio@redhat.com> In-Reply-To: <20191217155132.711335-1-fidencio@redhat.com> References: <20191217155132.711335-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [PATCH 1/4] util: Rewrite virGetUserDirectory() using g_get_home_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.84 on 10.5.11.22 X-MC-Unique: WNLxLchKMjmW-Ce12Idhzw-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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index ed1f696e37..70a05e3c9b 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -582,7 +582,13 @@ virGetHostnameQuiet(void) char * virGetUserDirectory(void) { - return virGetUserDirectoryByUID(geteuid()); + const char *homedir; + + homedir =3D g_get_home_dir(); + if (!homedir) + return NULL; + + return g_strdup_printf("%s/libvirt", homedir); } =20 =20 --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 13:45:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; 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 207.211.31.81 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=1576597921; cv=none; d=zohomail.com; s=zohoarc; b=kSMvqM99G/gOB3n6eGcxhyY2lXYe0E+wD9poyNUBVGhcnCAaGwc5SkTqv0OKbnloS2/BT2YaLrix8dvqVKutqEOnnnJTeXkGfywCce7p/gjjDp3LDp/QVMPXHb8sZ0087fV/yobd6DLoxHlkODUqqpRyBZkHn6hmccnp/HDI0CI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576597921; 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=+0K+YpoFTknPHkeZmjQdf3wxNqRKghB1Xvv9Aqr5GjM=; b=boUXYa3f+7Tqiunt2MfPIrVE4YkwVdr1qylFKoPybfATY0+NeS6qxg9M5N8HPmxVGYiRdsyiNTkAuFcVsUr2+R3G+r9pkZKBRdrdUuzo4JTBAaW/G3qoUh4zq1O+Adv1lF7W4Hy0rOIE7ykIQv1fqbBt3Jw5nRBpBR/C+LaFX10= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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 [207.211.31.81]) by mx.zohomail.com with SMTPS id 1576597921266111.35541332365165; Tue, 17 Dec 2019 07:52:01 -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-177-JzeDMIG2O46s_U-w5IlGZw-1; Tue, 17 Dec 2019 10:51:58 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 234318034A5; Tue, 17 Dec 2019 15:51:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E7FA66887D; Tue, 17 Dec 2019 15:51:49 +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 A17F8104907; Tue, 17 Dec 2019 15:51:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xBHFpeFA028607 for ; Tue, 17 Dec 2019 10:51:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id D464960933; Tue, 17 Dec 2019 15:51:40 +0000 (UTC) Received: from laerte.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33B3EA4B60; Tue, 17 Dec 2019 15:51:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576597919; 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=+0K+YpoFTknPHkeZmjQdf3wxNqRKghB1Xvv9Aqr5GjM=; b=YAw1alM69xHxOfchZRTsXFDnpG0vmeg5B9jsAPYk3s4+v7F8lxjPOQHcQ7OuMLtRSlAfWU BWGg9rPwr2QrRyiDvRaRLi2W1ggsbd+mULuRVa8Ku4pdOHW9gNP+pjGvbq0MpDKDnoBFog jvXVQD7v3ULif98qDYtlshSV49cOLlA= From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Tue, 17 Dec 2019 16:51:30 +0100 Message-Id: <20191217155132.711335-3-fidencio@redhat.com> In-Reply-To: <20191217155132.711335-1-fidencio@redhat.com> References: <20191217155132.711335-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [PATCH 2/4] util: Rewrite virGetUserConfigDirectory() using g_get_user_config_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.15 X-MC-Unique: JzeDMIG2O46s_U-w5IlGZw-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 | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index 70a05e3c9b..6fae3e8288 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -592,6 +592,17 @@ virGetUserDirectory(void) } =20 =20 +char *virGetUserConfigDirectory(void) +{ + const char *configdir =3D g_get_user_config_dir(); + + if (!configdir) + return NULL; + + return g_strdup_printf("%s/libvirt", configdir); +} + + #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, @@ -760,11 +771,6 @@ static char *virGetXDGDirectory(const char *xdgenvname= , const char *xdgdefdir) return ret; } =20 -char *virGetUserConfigDirectory(void) -{ - return virGetXDGDirectory("XDG_CONFIG_HOME", ".config"); -} - char *virGetUserCacheDirectory(void) { return virGetXDGDirectory("XDG_CACHE_HOME", ".cache"); @@ -1193,21 +1199,6 @@ virGetUserShell(uid_t uid G_GNUC_UNUSED) return NULL; } =20 -char * -virGetUserConfigDirectory(void) -{ - char *ret; - if (virGetWin32SpecialFolder(CSIDL_LOCAL_APPDATA, &ret) < 0) - return NULL; - - if (!ret) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unable to determine config directory")); - return NULL; - } - return ret; -} - char * virGetUserCacheDirectory(void) { @@ -1248,15 +1239,6 @@ virGetUserShell(uid_t uid G_GNUC_UNUSED) return NULL; } =20 -char * -virGetUserConfigDirectory(void) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("virGetUserConfigDirectory is not available")); - - return NULL; -} - char * virGetUserCacheDirectory(void) { --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 13:45:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; 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 207.211.31.81 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=1576597915; cv=none; d=zohomail.com; s=zohoarc; b=VmqbVB1tlsyMY4bMqsFqzeFvUfiMvuAWisoJKKbe/LfaTbOUG0SF9KxdAf4vDWLVN3iUrA6CgYyjbC+yd+vkMZ8YFWxMrQdaH4OTDHOrcir/RMJMu7PPzXET8OeAU0IhAP3fs9rCmOoZKjh/XcT95FlmxZjUBf8rF/78R9NcAwA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576597915; 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=9PTDgpgBs1vjjRGvWyvn2kVT34mC+S/r3Z8IWQ7VZoQ=; b=gyatxF+RWxzS/OqjH7d6/AWPzojxRKAHC6uE8I2A1F/w6PciemHtGwr929YccpOuymTlCgL/DSqcM5U5MuoTs+7JKYQfyDutjBqm+ePL6+V1qWDWSAXSUs/7saCrgiajdMibMHKxk/GYAYxeIVJ2+P40OUjHDOxxF32gTdUco44= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1576597915783131.21820661984657; Tue, 17 Dec 2019 07:51:55 -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-105-PMXs-It_PNyUTAK0aaVWxw-1; Tue, 17 Dec 2019 10:51:52 -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 6D2088F1AC; Tue, 17 Dec 2019 15:51:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E0706619DB; Tue, 17 Dec 2019 15:51:45 +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 9291A104872; Tue, 17 Dec 2019 15:51:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xBHFpf2f028614 for ; Tue, 17 Dec 2019 10:51:41 -0500 Received: by smtp.corp.redhat.com (Postfix) id CDF3C60933; Tue, 17 Dec 2019 15:51:41 +0000 (UTC) Received: from laerte.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E288A4B60; Tue, 17 Dec 2019 15:51:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576597914; 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=9PTDgpgBs1vjjRGvWyvn2kVT34mC+S/r3Z8IWQ7VZoQ=; b=AK+n6pJpKkltFq/Cdu07aCaXANqjhi+mH1TWfK3gNGlmkC9y0+pwh+6XDf+6yi0LeBRziS LnLS7UShaM2Ujl2hgiq6C/Cq64+qMk8fdAtKcsj/SmKLx27ICViUz+/sRceqLG/SjoFndQ srh5JT8b9LO0wAoFDb9J+gq/39uMLXY= From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Tue, 17 Dec 2019 16:51:31 +0100 Message-Id: <20191217155132.711335-4-fidencio@redhat.com> In-Reply-To: <20191217155132.711335-1-fidencio@redhat.com> References: <20191217155132.711335-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [PATCH 3/4] util: Rewrite virGetUserCacheDirectory() using g_get_user_cache_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: PMXs-It_PNyUTAK0aaVWxw-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 | 58 +++++++++------------------------------------- 1 file changed, 11 insertions(+), 47 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index 6fae3e8288..993a959555 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -603,6 +603,17 @@ char *virGetUserConfigDirectory(void) } =20 =20 +char *virGetUserCacheDirectory(void) +{ + const char *cachedir =3D g_get_user_cache_dir(); + + if (!cachedir) + return NULL; + + return g_strdup_printf("%s/libvirt", cachedir); +} + + #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, @@ -753,29 +764,6 @@ char *virGetUserShell(uid_t uid) } =20 =20 -static char *virGetXDGDirectory(const char *xdgenvname, const char *xdgdef= dir) -{ - const char *path =3D getenv(xdgenvname); - char *ret =3D NULL; - char *home =3D NULL; - - if (path && path[0]) { - ret =3D g_strdup_printf("%s/libvirt", path); - } else { - home =3D virGetUserDirectory(); - if (home) - ret =3D 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 =3D getenv("XDG_RUNTIME_DIR"); @@ -1199,21 +1187,6 @@ virGetUserShell(uid_t uid G_GNUC_UNUSED) return NULL; } =20 -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) { @@ -1239,15 +1212,6 @@ virGetUserShell(uid_t uid G_GNUC_UNUSED) return NULL; } =20 -char * -virGetUserCacheDirectory(void) -{ - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("virGetUserCacheDirectory is not available")); - - return NULL; -} - char * virGetUserRuntimeDirectory(void) { --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun Apr 28 13:45:37 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; 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 207.211.31.81 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=1576598055; cv=none; d=zohomail.com; s=zohoarc; b=WITIdm7EQAhxagKu41k9sL+CQjjF6JQH878KJRm9fm+KdSwhTJP1qKLLD+ty2ppRPoAYA9zIS6Po0vaYQGbEhDP0a+iOXE/Pwk2r8CkNVBfVL3hY+2ItW/E9snUycwC2zD9IHBKUR6tDUykjuf0GpW4CCrV/fSCvw0qPYawUTi0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576598055; 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=TADdvkXaiml4Y6aQg3EtSEL3+WVUAPzJ+XtgLR3Bxh4=; b=EtMPf3vDo+2jY9uR0K/++vudaBhasA2MJMDyEwq3FSj9ukFb7JDbq/96VZBdP7J68X1NnpvVoTOB2A73tr33rCjR1qkK+jMcILL3CyVShLtAACuoQhsOg/HU7BRZisG+Zf5yXPYPIyxX40S9ipUHOW39GK3WcjEH6v2WFQzB9R8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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 [207.211.31.81]) by mx.zohomail.com with SMTPS id 1576598055575283.0773722287481; Tue, 17 Dec 2019 07:54:15 -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-55-hHO9xqjNO6iiefgLa0pEjg-1; Tue, 17 Dec 2019 10:51:58 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5E5761052216; Tue, 17 Dec 2019 15:51:50 +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 390145C54A; Tue, 17 Dec 2019 15:51:50 +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 E6A8C18089D5; Tue, 17 Dec 2019 15:51:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xBHFpgB1028624 for ; Tue, 17 Dec 2019 10:51:42 -0500 Received: by smtp.corp.redhat.com (Postfix) id C77E760933; Tue, 17 Dec 2019 15:51:42 +0000 (UTC) Received: from laerte.redhat.com (unknown [10.43.2.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 28B3FA4B60; Tue, 17 Dec 2019 15:51:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576598054; 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=TADdvkXaiml4Y6aQg3EtSEL3+WVUAPzJ+XtgLR3Bxh4=; b=Sk836nx1GneBZolzLCGEKhvd7KLRx30ce/zr137Sefd4dodEyspvd07mns12qNDxpKj0Q5 ifrYg7BAvd8ZTxAkGe27GhsPyB9VzN2IGmAIBYAXgiDP/xx6g9P8sgvpRL5d+bV5hn4Mi6 RXHku6+r9KpLlMdLOj1B33GidftevhM= From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= To: libvir-list@redhat.com Date: Tue, 17 Dec 2019 16:51:32 +0100 Message-Id: <20191217155132.711335-5-fidencio@redhat.com> In-Reply-To: <20191217155132.711335-1-fidencio@redhat.com> References: <20191217155132.711335-1-fidencio@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Subject: [libvirt] [PATCH 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.16 X-MC-Unique: hHO9xqjNO6iiefgLa0pEjg-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 | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index 993a959555..62cb3390f8 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -614,6 +614,17 @@ char *virGetUserCacheDirectory(void) } =20 =20 +char *virGetUserRuntimeDirectory(void) +{ + const char *runtimedir =3D g_get_user_runtime_dir(); + + if (!runtimedir) + return NULL; + + return g_strdup_printf("%s/libvirt", runtimedir); +} + + #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, @@ -764,20 +775,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; @@ -1187,12 +1184,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) @@ -1211,15 +1202,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