From nobody Fri Apr 19 11:38:20 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+66163+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+66163+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1602573838; cv=none; d=zohomail.com; s=zohoarc; b=WKvs659nO48KgltmqiBeShf7bA6a0JHd5gOPNAF7+BeR09BVfT4xT2vxfDG4p2+8t6kz6Zj1VjJZXu45uekf7Z3cal63FPfbPS8Ntcumc3EHddRFBqt5d1Aqg/omqAs0UvqiXEupBynpHervwp9entkaN5RdE6FzOolz50kp7Hs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602573838; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=ukns/kqYNRVwMaIlcUBywTPeQYHkPZUL4Fs9JbEc5zw=; b=HqE3Onw+HgPfef2fCVkxo9kvr41wX16H9P/5nG61wq3RGhAGXyL3UEbS/rr7iBA+OxMbpfiim3IicXkHKc5KMdk1KZIcuq2WRlu9EaruOBK1iWHeTHS60qJivexAVCGLN4PR/b2fNMUfb+fZhtai4x/J/y7IPSiRNq/0vi3EYaQ= 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+66163+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 1602573838555633.7206145660323; Tue, 13 Oct 2020 00:23:58 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id g74TYY1788612xDejxwDeFVE; Tue, 13 Oct 2020 00:23:56 -0700 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web12.6458.1602573830789791188 for ; Tue, 13 Oct 2020 00:23:50 -0700 IronPort-SDR: oBk0ooDxGX9Cz4iCEStaMqf3MHgDyc3Trk0cd0znD0NUU7Vn5Ud1U+tl6+hz4x6TZOZlg+IQEz gAbl/bKrRTkw== X-IronPort-AV: E=McAfee;i="6000,8403,9772"; a="145730914" X-IronPort-AV: E=Sophos;i="5.77,369,1596524400"; d="scan'208";a="145730914" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Oct 2020 00:23:49 -0700 IronPort-SDR: +L6N0ai7IPRudWrePIVSw1F0BX/KJ24GsMv7yeJEwwASajWREh78BXI/o48p/xzDqfvQ3W3ufr gyg5FBH6A1Bg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,369,1596524400"; d="scan'208";a="463391508" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.66]) by orsmga004.jf.intel.com with ESMTP; 13 Oct 2020 00:23:48 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: Yunhua Feng , Liming Gao Subject: [edk2-devel] [Patch] Basetools: Fixed FMMT Linux build break issue Date: Tue, 13 Oct 2020 15:23:39 +0800 Message-Id: <20201013072339.20644-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: kB5yYuHXEIpR99t9Qz6dHe9gx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1602573836; bh=dJmnZTKu2KhrXCwdfdTo6oWFsg0uTAkcjcMPEdtWhz8=; h=Cc:Date:From:Reply-To:Subject:To; b=O6hOvgX76lifzI8uHkDpo4XyWX8NwwrvIPzUzxw2AZKVP+smkKf/reLigMTZW4+wUG1 ihgFQPltm/ouKobfpPcm/BBw22zIZzBSlAxbRwN+THeq8l4V1WYJPg5SXyLYHxAo+pXoQ fhq0ZbVKSxTycQTu+GU6qgfSCMUGzbTeue4= 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 (#66163): https://edk2.groups.io/g/devel/message/66163 Mute This Topic: https://groups.io/mt/77478681/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-