From nobody Mon Feb 9 12:12:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 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=1646229425; cv=none; d=zohomail.com; s=zohoarc; b=WlOtJnoteQ8jfgwKvgcXnVnII0Y6rVCsu011N5WWta/d0Y4rZyVCD5rw7lJwZXyNe80kVaKsftfZufKvzOn+QU0XDX6nAk0N6H/2yJtdLbyEg166tDXi6LRkMD9K6Yl68sjSRpjoJgcMRD39i9hAeuYWPHrKS3eiJWWVvqywUYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1646229425; h=Content-Type:Content-Transfer-Encoding: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=v5Oj9wRZv7AWzZHHBlPldovdANkFs1zTn2ycWuM3K+0=; b=nVSFGfkn6BKSKjHu39iY+GpBtPhQC5pxbo87lKFlW2qF50GlgVEQhto7yKLDGu/pQDDy4DiS0oxH5iDhDZdtz9YxJOQrO83FPax7USZBQBlhZy5Dim2Jcg/axGTpU9U5GkSX19nBB4pM6vwyGebzjXNG/YD0JgSnbmbWMTvu2Ng= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1646229425502780.9320156315391; Wed, 2 Mar 2022 05:57:05 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-77-B9qE4SURPqO80_qWaNmK3w-1; Wed, 02 Mar 2022 08:56:51 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 87E93100CCC6; Wed, 2 Mar 2022 13:56:43 +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 5FFFC26E41; Wed, 2 Mar 2022 13:56:43 +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 2ED6F4ED28; Wed, 2 Mar 2022 13:56:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 222Due5v018222 for ; Wed, 2 Mar 2022 08:56:40 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3F77083788; Wed, 2 Mar 2022 13:56:40 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id A463E83783 for ; Wed, 2 Mar 2022 13:56:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646229424; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=v5Oj9wRZv7AWzZHHBlPldovdANkFs1zTn2ycWuM3K+0=; b=iYeUxH7ZZ1H+n6pMlVvTA5FLjqkWlz8NonwF246fdPotSw9Iwg2cygX+5z78A74iO1+oC5 JQ+Kepw8qo9pFGE3/LWQFX5Uok7r16TddAqF8Iryxf46p0v7Fxrzip9/vFbxJ7NDd6yu4k fX3g/UguzD1WJ9JwrzXNmzae/CK9SPk= X-MC-Unique: B9qE4SURPqO80_qWaNmK3w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 18/23] vsh: Add helper for auto-removing temporary file Date: Wed, 2 Mar 2022 14:55:17 +0100 Message-Id: <812b148f13c63b7d64be375c401a38b7c8831e6d.1646229194.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com 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.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1646229427644100004 Content-Type: text/plain; charset="utf-8" The vsh helpers for user-editing of contents use temporary files. Introduce 'vshTempFile' type which automatically removes the file. Signed-off-by: Peter Krempa --- tools/vsh.c | 25 +++++++++++++++++++------ tools/vsh.h | 3 +++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 4ec5e54b5d..bbde594967 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2378,34 +2378,47 @@ vshAskReedit(vshControl *ctl, #endif /* WIN32 */ +void +vshEditUnlinkTempfile(char *file) +{ + if (!file) + return; + + ignore_value(unlink(file)); + g_free(file); +} + + /* Common code for the edit / net-edit / pool-edit functions which follow.= */ char * vshEditWriteToTempFile(vshControl *ctl, const char *doc) { - g_autofree char *ret =3D NULL; + g_autofree char *filename =3D NULL; + g_autoptr(vshTempFile) ret =3D NULL; const char *tmpdir; VIR_AUTOCLOSE fd =3D -1; tmpdir =3D getenv("TMPDIR"); - if (!tmpdir) tmpdir =3D "/tmp"; - ret =3D g_strdup_printf("%s/virshXXXXXX.xml", tmpdir); - fd =3D g_mkstemp_full(ret, O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR); + if (!tmpdir) + tmpdir =3D "/tmp"; + filename =3D g_strdup_printf("%s/virshXXXXXX.xml", tmpdir); + fd =3D g_mkstemp_full(filename, O_RDWR | O_CLOEXEC, S_IRUSR | S_IWUSR); if (fd =3D=3D -1) { vshError(ctl, _("g_mkstemp_full: failed to create temporary file: = %s"), g_strerror(errno)); return NULL; } + ret =3D g_steal_pointer(&filename); + if (safewrite(fd, doc, strlen(doc)) =3D=3D -1) { vshError(ctl, _("write: %s: failed to write to temporary file: %s"= ), ret, g_strerror(errno)); - unlink(ret); return NULL; } if (VIR_CLOSE(fd) < 0) { vshError(ctl, _("close: %s: failed to write or close temporary fil= e: %s"), ret, g_strerror(errno)); - unlink(ret); return NULL; } diff --git a/tools/vsh.h b/tools/vsh.h index e208d957bb..663dc1ffce 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -341,6 +341,9 @@ void vshSaveLibvirtError(void); void vshSaveLibvirtHelperError(void); /* file handling */ +void vshEditUnlinkTempfile(char *file); +typedef char vshTempFile; +G_DEFINE_AUTOPTR_CLEANUP_FUNC(vshTempFile, vshEditUnlinkTempfile); char *vshEditWriteToTempFile(vshControl *ctl, const char *doc); int vshEditFile(vshControl *ctl, const char *filename); char *vshEditReadBackFile(vshControl *ctl, const char *filename); --=20 2.35.1