From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.101.70; helo=foss.arm.com; envelope-from=lokesh.bv@arm.com; receiver=edk2-devel@lists.01.org Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 73D0421195BF7 for ; Tue, 27 Nov 2018 09:50:43 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4F2B81DC8; Tue, 27 Nov 2018 09:50:43 -0800 (PST) Received: from usa.arm.com (a075554-lin.blr.arm.com [10.162.0.156]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 362923F575; Tue, 27 Nov 2018 09:50:41 -0800 (PST) From: Lokesh B V To: edk2-devel@lists.01.org Date: Tue, 27 Nov 2018 23:20:35 +0530 Message-Id: <1543341035-22358-1-git-send-email-lokesh.bv@arm.com> X-Mailer: git-send-email 2.7.4 Subject: [PATCH 2/2] [edk2-test][PATCH v2] SctPkg/Tools: Fix incorrect line ending detection by GenBin tool X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2018 17:50:43 -0000 Some windows editors uses "\r\n" for line feed. While processing uefi testcase info file, the GenBin tool logic to skip line feed doesn't consider the presence of carraige return(\r) in line feed. So this results in incorrect format error. Cc: Supreeth Venkatesh Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Lokesh B V Signed-off-by: Lokesh B V --- uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c index 61bb35b..4eaefcc 100644 --- a/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c +++ b/uefi-sct/SctPkg/Tools/Source/GenBin/GenBin.c @@ -2,6 +2,7 @@ Copyright 2006 - 2010 Unified EFI, Inc.
Copyright (c) 2010 Intel Corporation. All rights reserved.
+ Copyright (c) 2018 ARM Ltd. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License @@ -176,6 +177,7 @@ Trim ( for (Index1 = 0; Index1 < Length; Index1++) { if ((String[Index1] != ' ' ) && (String[Index1] != '\t') && + (String[Index1] != '\r') && (String[Index1] != '\n')) { break; } @@ -193,6 +195,7 @@ Trim ( for (Index1 = 0; Index1 < Length; Index1++) { if ((String[Length - 1 - Index1] != ' ' ) && (String[Length - 1 - Index1] != '\t') && + (String[Length - 1 - Index1] != '\r') && (String[Length - 1 - Index1] != '\n')) { break; } -- 2.7.4