From nobody Wed Mar 09 20:52:52 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AF63E1A144D2; Wed, 9 Mar 2022 20:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KDPXh3xvsz3QPV; Wed, 9 Mar 2022 20:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646859172; 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; bh=HSe7CQYC7YBxVnD5Y3L7NgAR7kDVv7SB0UfGv/cdKww=; b=SQfgm72npkggTvTzR2bjL2q30lLe+nkyEV2SphiKFjWQb0NWL69QhvwCsROVGbBVrHZWLA 2rja0qIFR6jojy9fSDjBRsGbzrDAjPZog8y2ttplGe6Q90ggux7KuKR/buBVQYUx9qjY1F mbbdkHqn2Vdqxv9Z6ogwrU/MjMG3mhP3Ii7gjnKB5OiVqaUpJxQL7DvAm3N3SWWc2EL+04 V32rCkAqjuJQ1OWo2cefM7OcYakD/faCeeJQw4jwbAUv/Ab0azG3gTHlkKwwQuUPZHTefG EQ8l4pBoJUm/1Z5xvLNsJ/2N2C6oK9GY7tfdQltK+ZYnbq2rYIq54Xh9EPzhww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5DC3B17F35; Wed, 9 Mar 2022 20:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 229KqqYM062154; Wed, 9 Mar 2022 20:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 229KqqKF062153; Wed, 9 Mar 2022 20:52:52 GMT (envelope-from git) Date: Wed, 9 Mar 2022 20:52:52 GMT Message-Id: <202203092052.229KqqKF062153@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: ec80ee29ae0f - stable/13 - libefivar: Correct the string expression of UTF8 vendor device path List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ec80ee29ae0f8f82a7fe2e0c7c7da519fe8b3f3d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646859172; 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; bh=HSe7CQYC7YBxVnD5Y3L7NgAR7kDVv7SB0UfGv/cdKww=; b=Sh7ZO62EXZIGIlAPLvrpIRK1HhBLE6pHDYOVeFBSLhWGD529CF28ohlBrTRrzs2x/Oji7Z /JfR8fuRJxxMMWInKOMf6xkaUPneyPvZhusMNaa6w3fSfO5zzgtq4VjqO9deybYVxP86qC L9eTO78wCkmq1lnbWzOEh9YLtYPrWWo39nPCIEZV98Jy+E5+z5zE5QjxsIKnML958SiI4V WN1wO/yWT3JotSnSsf3Gkf1ntjqmkqQpP38T4Utf+/QYSdLzua71T0HqDi+yUmgDxEAckY 9J8WIVqCQqXsX2vuoGboiYuVSFJ05AKk1VBGJTTCABpTn3DlCpLBHL6K4eIICw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646859172; a=rsa-sha256; cv=none; b=Ic/GdiOGnlNbkEAoItZXQwvEI8atwVJ6x4g2ERBQhaEPLUa0Iql/5WyfS6eiFp1m79DnqF 4gg4Dc94Eptjx9Vp8pvZ+zuVqusyWrIt0KcjA5lsgDwoSCdoirEGxTgeuRzqHi55BYAbvN swibbzhvafzTSI70V78ghZ2TOl/6g90rfUU6mVYqStOco8mCqhzgSG6REwUJ6reXNMo/O7 oacSNN4S0ReOo5HYdupasq9gJXoxr6gAmDOxiOfazU7BBo3bJCNsJscjKRyBaGnpqZL2Oo I7Gjvfm6ZKsh24LWvOGDddrzLSODrevhaRBRk/+/Sd4VYmdze2UGSqW+VXTu/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ec80ee29ae0f8f82a7fe2e0c7c7da519fe8b3f3d commit ec80ee29ae0f8f82a7fe2e0c7c7da519fe8b3f3d Author: Jose Luis Duran AuthorDate: 2022-02-22 11:39:03 +0000 Commit: Warner Losh CommitDate: 2022-03-09 20:52:22 +0000 libefivar: Correct the string expression of UTF8 vendor device path According to UEFI spec, the string expression of UTF8 vendor device node should be displayed as: VenUtf8(). Current code display it as: VenUft8() by mistake when convert device path node to text. This commit is to fix this bug. Upstream Bug: https://bugzilla.tianocore.org/show_bug.cgi?id=1225 Obtained from: https://github.com/tianocore/edk2/commit/959be180e185869b71db9dad34c3f4bba660d724 Pull Request: https://github.com/freebsd/freebsd-src/pull/580 (cherry picked from commit 91a35e5803bef59b8ca67b0621216124cc2e42f8) --- lib/libefivar/efivar-dp-format.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libefivar/efivar-dp-format.c b/lib/libefivar/efivar-dp-format.c index aa875dc45e70..14f6adc2fd98 100644 --- a/lib/libefivar/efivar-dp-format.c +++ b/lib/libefivar/efivar-dp-format.c @@ -255,7 +255,7 @@ DevPathToTextVendor ( UefiDevicePathLibCatPrint (Str, "VenVt100Plus()"); return ; } else if (CompareGuid (&Vendor->Guid, &gEfiVTUTF8Guid)) { - UefiDevicePathLibCatPrint (Str, "VenUft8()"); + UefiDevicePathLibCatPrint (Str, "VenUtf8()"); return ; } else if (CompareGuid (&Vendor->Guid, &gEfiUartDevicePathGuid)) { FlowControlMap = (((UART_FLOW_CONTROL_DEVICE_PATH *) Vendor)->FlowControlMap);