From nobody Mon Feb 9 08:29:47 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1612178913; cv=none; d=zohomail.com; s=zohoarc; b=P7pPnKRGtAVQSVJzr+Vs/9c/LfWHzsMmkDXnZ/WSOsB02ymaRmNbDWJ1u6Mk3ciDoQEYrF0EZ8CZYviZVn8I8huHN1C/bOMiCmAq01sOnfpHocjT2BslCAI6Lo0LvgI+YYsHNnu34TYYBwKU4CZh4GVDPjYxj8XW/z3Nx8rs78E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612178913; 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=86gxxcaHZBOLaT8weLMOEFGl6ynbW0kiAFiml8T32fs=; b=S7fObbj1pJXJxsL02Umc++tnfH12sTI3MgEwjjv8gmE+6M1EIBw1lykwTwWolDoR0zTPPpSmwX/P06X6XbnAITRPm/7hI741HNGZt0e8ieTlEk2RZZrqdZEU7qcDRQXiglYerQ9Y8SXivmdQmuldrbMNYmFUMyTpWR9HyaoQO+U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612178913560767.41886270464; Mon, 1 Feb 2021 03:28:33 -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-542-bY1EFU-pN4KieUKQ-fqCgA-1; Mon, 01 Feb 2021 06:28:30 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 46466107ACF8; Mon, 1 Feb 2021 11:28:25 +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 2330B6F988; Mon, 1 Feb 2021 11:28:25 +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 D7C141809CA1; Mon, 1 Feb 2021 11:28:24 +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 111BSNDw003337 for ; Mon, 1 Feb 2021 06:28:23 -0500 Received: by smtp.corp.redhat.com (Postfix) id 435036A90C; Mon, 1 Feb 2021 11:28:23 +0000 (UTC) Received: from work.redhat.com (ovpn-113-167.ams2.redhat.com [10.36.113.167]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55165669F2; Mon, 1 Feb 2021 11:28:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612178912; 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=86gxxcaHZBOLaT8weLMOEFGl6ynbW0kiAFiml8T32fs=; b=AA3NLZ/Iu4aoPHLwqDFaYjEDxU/XzLCzz+Gw/Lw2pUvMvKF+fPEO5Ham2X5nr5bRpd4SOa L75LY9oH0+VXd6Z7eZgNA8sj8CVYBlZAmwkjduzCd2WBUFNTYx9lJ1c/sSoH5TIGsd8vrk YJrfTIgx+0LFYiItZexrMXW5fkj/nDg= X-MC-Unique: bY1EFU-pN4KieUKQ-fqCgA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 09/20] commandhelper: Factor out printEnvironment Date: Mon, 1 Feb 2021 12:27:53 +0100 Message-Id: <20210201112804.144366-10-twiederh@redhat.com> In-Reply-To: <20210201112804.144366-1-twiederh@redhat.com> References: <20210201112804.144366-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Peter Krempa , Tim Wiederhake 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.13 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Peter Krempa --- tests/commandhelper.c | 57 +++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 21 deletions(-) diff --git a/tests/commandhelper.c b/tests/commandhelper.c index ec54f55eb6..842cc72942 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -106,11 +106,44 @@ static int envsort(const void *a, const void *b) } } =20 +static int printEnvironment(FILE *log) +{ + char **newenv; + size_t length; + size_t i; + int ret =3D -1; + + for (length =3D 0; environ[length]; length++) { + } + + if (!(newenv =3D malloc(sizeof(*newenv) * length))) + goto cleanup; + + for (i =3D 0; i < length; i++) { + newenv[i] =3D environ[i]; + } + + qsort(newenv, length, sizeof(newenv[0]), envsort); + + for (i =3D 0; i < length; i++) { + /* Ignore the variables used to instruct the loader into + * behaving differently, as they could throw the tests off. */ + if (!STRPREFIX(newenv[i], "LD_")) + fprintf(log, "ENV:%s\n", newenv[i]); + } + + ret =3D 0; + + cleanup: + if (newenv) + free(newenv); + return ret; +} + int main(int argc, char **argv) { struct Arguments *args =3D parseArguments(argc, argv); - size_t i, n; + size_t i; int open_max; - char **newenv =3D NULL; char *cwd; FILE *log =3D fopen(abs_builddir "/commandhelper.log", "w"); int ret =3D EXIT_FAILURE; @@ -126,25 +159,9 @@ int main(int argc, char **argv) { =20 printArguments(log, argc, argv); =20 - for (n =3D 0; environ[n]; n++) { - } - - if (!(newenv =3D malloc(sizeof(*newenv) * n))) + if (printEnvironment(log) !=3D 0) goto cleanup; =20 - for (i =3D 0; i < n; i++) { - newenv[i] =3D environ[i]; - } - - qsort(newenv, n, sizeof(newenv[0]), envsort); - - for (i =3D 0; i < n; i++) { - /* Ignore the variables used to instruct the loader into - * behaving differently, as they could throw the tests off. */ - if (!STRPREFIX(newenv[i], "LD_")) - fprintf(log, "ENV:%s\n", newenv[i]); - } - open_max =3D sysconf(_SC_OPEN_MAX); if (open_max < 0) goto cleanup; @@ -275,8 +292,6 @@ int main(int argc, char **argv) { free(buffers[i]); if (args) free(args); - if (newenv) - free(newenv); if (log) fclose(log); return ret; --=20 2.26.2