From nobody Fri Apr 1 03:43:48 2022 X-Original-To: dev-commits-src-all@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 6CEDD1A56B95; Fri, 1 Apr 2022 03:43:48 +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 4KV5ch2F77z4rgB; Fri, 1 Apr 2022 03:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648784628; 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=dWWW/3jGW7OxnQ55YYMemT2d6sNwgJre03qTJPV4FwM=; b=nc4TAgBsFhgUKy6ypBoSac7dcZJs8oaMEgm1C/DeIEMo0DMuSnw4kd04kSYRhO9tRBcntF aFqIDCuaYQaFWhvUXTcJbsXcVDHak9EPIFLYcnrZYAu/PGg7m3AmtQHTUnJFDp03xYnJaN bDQRzuw58oqb2h+SuNsnV5ViBbanpE7AQR/rlZI/h8qYlyHcc8edrTRC0ZbepwATYyj/1X x0sMoQQWW19Jd0LKJIF+116uDgXrHc79YMWKaQC4g6VZ4pOPQxkE2dVWvMvPow7lPuljhs KO0mMhYVKJYROpipQ1E/iGES1rSM7TvbEoRcbgUSb3vYPlspbL7Lh3ZlffHNTw== 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 2E4E24769; Fri, 1 Apr 2022 03:43:48 +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 2313hme1042807; Fri, 1 Apr 2022 03:43:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2313hmL0042806; Fri, 1 Apr 2022 03:43:48 GMT (envelope-from git) Date: Fri, 1 Apr 2022 03:43:48 GMT Message-Id: <202204010343.2313hmL0042806@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: c3eec165508b - stable/12 - libefivar: Correct the string expression of UTF8 vendor device path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/12 X-Git-Reftype: branch X-Git-Commit: c3eec165508b47b3474a8b27c29712135ea0d137 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648784628; 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=dWWW/3jGW7OxnQ55YYMemT2d6sNwgJre03qTJPV4FwM=; b=R5FyWlhDPftb4VKjOWMhnN2xUjszJejSYMnyUA9LvAff/VMIQhfIr79no9o74TIwojiy9f ujpzCgTWoE560a45oECLeI4c+UfxozKhBWaFmUX6Uknhdt7rsnh2nM334b2AaakRmwMvd5 MCeOeSAsZOHoiP9+QSD/zy12ByHgIRBUPdp1YuBXyOuWvj9Mu3hFOyb+qT9a5qveHFZTza NmFhteKOPjt1A5Z1SWdFyhI8XbCeloykF/fSJI2b6Zxbeh2dfjoDO8ETqxaexOTHhNlYW3 Xsinom/H9GQjAk7owxeO80AvE9RxbLDOQ8in+ZgDj5ljAZ0keiTBo9RXEIrwVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648784628; a=rsa-sha256; cv=none; b=lnXmcsOW6uHT7V52o6W0Y+2yiKvxuKWiT74YTjRs8OiqgbPPAXkW4VJ/htog9p8ea1CM2H NwAZPm2P+21egmLCZkbtX4Ece/S6Cr3Bu23t5B8ZyT7oUvR8GWgqUe9ucIfKGWADJeJcPa BX9yJ7g0G9PIDBDwrzbTWKlgyEVqoQoJ7zhNe7Idkus/avwKG5xsF+wY5cRZ0NcLZq2dNC V7jGbHYacXa64RK+Z+G72HhXKqBK/ZZgKL+4yliZ4gbC+uUUD3NjgMocUt+6y74gUxeB+p XrbU6DrJW2amlJZHg1TihZCT/ioNG5fd+YJafMgFccrV7LzttY+/NMecFY+NVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c3eec165508b47b3474a8b27c29712135ea0d137 commit c3eec165508b47b3474a8b27c29712135ea0d137 Author: Jose Luis Duran AuthorDate: 2022-02-22 11:39:03 +0000 Commit: Warner Losh CommitDate: 2022-04-01 03:43:35 +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 274c2fccd622..a063dcff2218 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);