From nobody Tue Apr 16 13:31:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66170+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66170+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1602580866; cv=none; d=zohomail.com; s=zohoarc; b=chRRU/EP0SmWm1ALFMte3JaH1xzOarPYuDus5bhE3L4/2UXTMKcbb90ZRN6bmN55KixgXFkGjZKACHohwc2lIsfXYaOgdwEFFQ+OFMbs67x9s4p4UPwh0aiIhYj6FT/ShQgzwmEgrem0IaIJyoUtxxSAyy5w+lNb+nLHJfxG9sU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602580866; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=W5uPRyp3NCuVySp73ktwYqhivylObVP6kmo9II+W5sE=; b=G+27Cmedh0nzq135/5KvzJpVz/NZ2WrliYofLK4dsZpbXdtnbJxNW2CyXXsxqeaTsgHJdYy96BNYXy252MoCMm8DhgQdnewHYD1KoygXV8C/3gjasAz9V3Vs64qMnYCoelLp5WnJu7nlaLBxSpAXV+wmXd9F3vUbQUl62z4uw7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66170+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1602580866144618.7023589389597; Tue, 13 Oct 2020 02:21:06 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id sW66YY1788612x5tLmgJopHM; Tue, 13 Oct 2020 02:21:05 -0700 X-Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web12.7869.1602580860295058412 for ; Tue, 13 Oct 2020 02:21:00 -0700 IronPort-SDR: MtwG4oB01pUGSlqaN0iLpXWuUyetfTxi55u5DEXqGG+oXm3OPW9Z3vNKPAvPf/qVYqTeIFz2dL kyjOmmOzV1TA== X-IronPort-AV: E=McAfee;i="6000,8403,9772"; a="250573311" X-IronPort-AV: E=Sophos;i="5.77,369,1596524400"; d="scan'208";a="250573311" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2020 02:20:59 -0700 IronPort-SDR: 7ZT9eaCEQg/Sw8Drj5r0UhJDXqgxCV6a27jFaIX02dWLUt/BtysharD6Y7wyWJ2Is5rQJfj66z dVy8NIx7lb7A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,369,1596524400"; d="scan'208";a="530324363" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.66]) by orsmga005.jf.intel.com with ESMTP; 13 Oct 2020 02:20:57 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: Yunhua Feng , Liming Gao Subject: [edk2-devel] [Patch] [edk2-staging]BaseTools/Fmmt: Fixed FMMT Linux build break issue Date: Tue, 13 Oct 2020 17:20:35 +0800 Message-Id: <20201013092035.24440-1-bob.c.feng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,bob.c.feng@intel.com X-Gm-Message-State: F8PXye19TDtceZpwCS0Y3b6Dx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1602580865; bh=+PhaZf49s5d2PR7/zRMK9xkKYFJVrO4KxKs75g54p+4=; h=Cc:Date:From:Reply-To:Subject:To; b=hSevM1gS8XPge+pYDqD4GuL/CXcMhAZTmvM34sO8BJkINp7R1Y/6ulwdrUiLsct+I6L orcfdVvCbOlIT2ZugoGyHCfVPdhXbqtJIgsXnAj7EHlZiUOIgDqJGIvrRz4elbEFOaYMk JhjLw5CcM4ZBbsom7a54tmNErbLeDKyjYmw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Fixed the FMMT Linux build issue which was introduced by the commit 950333853b5fe2b73a7b5148501458cc97a01481 Signed-off-by: Bob Feng Cc: Yunhua Feng Cc: Liming Gao --- .../Source/C/FMMT/FirmwareModuleManagement.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c b/BaseTools= /Source/C/FMMT/FirmwareModuleManagement.c index 20663ba163..8a7ae096d0 100644 --- a/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c +++ b/BaseTools/Source/C/FMMT/FirmwareModuleManagement.c @@ -9,11 +9,14 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include "FirmwareModuleManagement.h" #include "Rebase.h" #include #include - +#if defined(__linux__) +#include +#define _MAX_DIR PATH_MAX +#endif CHAR8* mGuidToolDefinition =3D "FmmtConf.ini"; extern EFI_FIRMWARE_VOLUME_HEADER *mFvHeader; extern UINT32 mFvLength; =20 // @@ -1715,15 +1718,10 @@ FmmtImageExtract ( EFI_STATUS Status; FIRMWARE_DEVICE *FdData; FV_INFORMATION *FvInFd; UINT32 Index; UINT32 FfsFoundFlag; - FFS_INFORMATION *OutputFileName; - FILE* NewFdFile; - FILE* NewFvFile; - UINT64 NewFvLength; - VOID* Buffer; CHAR8 *TemDir; UINT8 FvNumInFd; UINT32 Offset; UINT8 *FdBuffer; EFI_FFS_FILE_HEADER2 *CurrentFile; @@ -1738,18 +1736,13 @@ FmmtImageExtract ( int j; CHAR8 FfsOutputFileName[_MAX_DIR]; =20 FdSize =3D 0; Index =3D 0; - NewFvLength =3D 0; FfsFoundFlag =3D 0; FdData =3D NULL; FvInFd =3D NULL; - OutputFileName =3D NULL; - NewFdFile =3D NULL; - NewFvFile =3D NULL; - Buffer =3D NULL; TemDir =3D NULL; FvNumInFd =3D 0; Offset =3D 0; FdBuffer =3D NULL; if (sizeof(FfsOutFileOrDirName) > _MAX_DIR) { --=20 2.20.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66170): https://edk2.groups.io/g/devel/message/66170 Mute This Topic: https://groups.io/mt/77479598/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-