From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D1F2821959CB2 for ; Wed, 8 Aug 2018 20:44:26 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Aug 2018 20:44:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,213,1531810800"; d="scan'208";a="80168739" Received: from ray-dev.ccr.corp.intel.com ([10.239.9.4]) by orsmga001.jf.intel.com with ESMTP; 08 Aug 2018 20:44:25 -0700 From: Ruiyu Ni To: edk2-devel@lists.01.org Cc: Jaben Carsey Date: Thu, 9 Aug 2018 11:45:01 +0800 Message-Id: <20180809034502.131768-2-ruiyu.ni@intel.com> X-Mailer: git-send-email 2.16.1.windows.1 In-Reply-To: <20180809034502.131768-1-ruiyu.ni@intel.com> References: <20180809034502.131768-1-ruiyu.ni@intel.com> Subject: [PATCH 1/2] ShellPkg/redirection: Insert \xFEFF after converting ASCII to Unicode X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Aug 2018 03:44:27 -0000 When " Cc: Jaben Carsey --- ShellPkg/Application/Shell/FileHandleWrappers.c | 46 +++++++++++++++++-------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/ShellPkg/Application/Shell/FileHandleWrappers.c b/ShellPkg/Application/Shell/FileHandleWrappers.c index 8c62eb5862..655854b25d 100644 --- a/ShellPkg/Application/Shell/FileHandleWrappers.c +++ b/ShellPkg/Application/Shell/FileHandleWrappers.c @@ -1924,42 +1924,58 @@ FileInterfaceFileRead( OUT VOID *Buffer ) { + EFI_STATUS Status; + UINT64 Position; CHAR8 *AsciiStrBuffer; CHAR16 *UscStrBuffer; UINTN Size; - UINTN CharNum; - EFI_STATUS Status; if (((EFI_FILE_PROTOCOL_FILE*)This)->Unicode) { // // Unicode + // There might be different file tag for the Unicode file. We cannot unconditionally insert the \xFEFF. + // So we choose to leave the file content as is. // return (((EFI_FILE_PROTOCOL_FILE*)This)->Orig->Read(((EFI_FILE_PROTOCOL_FILE*)This)->Orig, BufferSize, Buffer)); } else { // // Ascii // - Size = (*BufferSize) / sizeof(CHAR16); - AsciiStrBuffer = AllocateZeroPool(Size + sizeof(CHAR8)); + *BufferSize = *BufferSize / sizeof (CHAR16) * sizeof (CHAR16); + if (*BufferSize == 0) { + return EFI_SUCCESS; + } + Status = ((EFI_FILE_PROTOCOL_FILE*)This)->Orig->GetPosition (((EFI_FILE_PROTOCOL_FILE*)This)->Orig, &Position); + if (EFI_ERROR (Status)) { + return Status; + } + if (Position == 0) { + // + // First two bytes in Buffer is for the Unicode file tag. + // + *(CHAR16 *)Buffer = gUnicodeFileTag; + Buffer = (CHAR16 *)Buffer + 1; + Size = *BufferSize / sizeof (CHAR16) - 1; + } else { + Size = *BufferSize / sizeof (CHAR16); + } + AsciiStrBuffer = AllocateZeroPool (Size + 1); if (AsciiStrBuffer == NULL) { return EFI_OUT_OF_RESOURCES; } - UscStrBuffer = AllocateZeroPool(*BufferSize + sizeof(CHAR16)); + UscStrBuffer = AllocateZeroPool ((Size + 1) * sizeof(CHAR16)); if (UscStrBuffer== NULL) { SHELL_FREE_NON_NULL(AsciiStrBuffer); return EFI_OUT_OF_RESOURCES; } - Status = (((EFI_FILE_PROTOCOL_FILE*)This)->Orig->Read(((EFI_FILE_PROTOCOL_FILE*)This)->Orig, &Size, AsciiStrBuffer)); + Status = ((EFI_FILE_PROTOCOL_FILE*)This)->Orig->Read (((EFI_FILE_PROTOCOL_FILE*)This)->Orig, &Size, AsciiStrBuffer); if (!EFI_ERROR(Status)) { - CharNum = UnicodeSPrint(UscStrBuffer, *BufferSize + sizeof(CHAR16), L"%a", AsciiStrBuffer); - if (CharNum == Size) { - CopyMem (Buffer, UscStrBuffer, *BufferSize); - } else { - Status = EFI_UNSUPPORTED; - } + AsciiStrToUnicodeStrS (AsciiStrBuffer, UscStrBuffer, Size + 1); + *BufferSize = Size * sizeof (CHAR16); + CopyMem (Buffer, UscStrBuffer, *BufferSize); } - SHELL_FREE_NON_NULL(AsciiStrBuffer); - SHELL_FREE_NON_NULL(UscStrBuffer); - return (Status); + SHELL_FREE_NON_NULL (AsciiStrBuffer); + SHELL_FREE_NON_NULL (UscStrBuffer); + return Status; } } -- 2.16.1.windows.1