From nobody Thu Sep 19 00:18:02 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1721311757482653.5278032609313; Thu, 18 Jul 2024 07:09:17 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 32973B69; Thu, 18 Jul 2024 10:09:16 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id B872AA5A; Thu, 18 Jul 2024 10:08:23 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 38D27A02; Thu, 18 Jul 2024 10:08:17 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C07379F0 for ; Thu, 18 Jul 2024 10:08:16 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-314-6zxBpBB8ONmvV7gJhwqyLA-1; Thu, 18 Jul 2024 10:08:13 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1F6DA1944A95 for ; Thu, 18 Jul 2024 14:08:13 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 64BE01955E80 for ; Thu, 18 Jul 2024 14:08:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: ** X-Spam-Status: No, score=2.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_NONE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721311696; h=from:from: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; bh=SOrid9R6nLj5pyrcKWET7yPZqsjs9bIC/UGDF7+mX8Q=; b=MgHJDvUSjFkxU/EHxwl+oLRFU/q8CLvXYPh1PJTpoiXy1QK8ZJDy4/zCbSp5EFPfarkcWq VqS+u+XsLWrGeKXKtRMEMed92yhFT+O2ZorM+sB9WIHd0PFIXRVaOJk/PEvVwrWKGiyLaW fD4vDsmLQxlycIMopFELCt1+AHXM/As= X-MC-Unique: 6zxBpBB8ONmvV7gJhwqyLA-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 2/5] virsysinfo: Trim newline when decoding OEM strings Date: Thu, 18 Jul 2024 16:08:04 +0200 Message-ID: <48bfb520e29816fb55895afb9dfca04d14892ca1.1721311651.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZEYK47GVZTJL4457DFZF2AUOVV5ZHNH4 X-Message-ID-Hash: ZEYK47GVZTJL4457DFZF2AUOVV5ZHNH4 X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1721311757988116600 Content-Type: text/plain; charset="utf-8"; x-default="true" dmidecode always puts a newline character at the end of each OEM string it prints. It's the dmi_oem_strings() function [1] that iterates over strings and calls pr_attr() over each one which puts "\n" at the end, unconditionally [2[. Since it's not part of the string though, trim it. 1: https://git.savannah.nongnu.org/cgit/dmidecode.git/tree/dmidecode.c#n2431 2: https://git.savannah.nongnu.org/cgit/dmidecode.git/tree/dmioutput.c#n63 Signed-off-by: Michal Privoznik --- src/util/virsysinfo.c | 2 ++ tests/sysinfotest.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 0d9083c891..cdc2a7d87b 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -915,6 +915,8 @@ virSysinfoDMIDecodeOEMString(size_t i, if (err && *err !=3D '\0') return -1; =20 + virStringTrimOptionalNewline(*str); + return 0; } =20 diff --git a/tests/sysinfotest.c b/tests/sysinfotest.c index 287c40c6f9..09cfe6fa45 100644 --- a/tests/sysinfotest.c +++ b/tests/sysinfotest.c @@ -66,7 +66,7 @@ testDMIDecodeDryRun(const char *const*args G_GNUC_UNUSED, if (STREQ(args[3], "3")) { *output =3D g_strdup("Ha ha ha try parsing\\n\n" " String 3: this correctly\n" - " String 4:then"); + " String 4:then\n"); } else { *error =3D g_strdup_printf("No OEM string number %s", args[3]); *status =3D EXIT_FAILURE; --=20 2.44.2