Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1pmTmo-0006Cx-IA for mharc-grub-devel@gnu.org; Wed, 12 Apr 2023 02:16:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmTma-00065b-LA for grub-devel@gnu.org; Wed, 12 Apr 2023 02:16:40 -0400 Received: from mail-ve1eur01on2081.outbound.protection.outlook.com ([40.107.14.81] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmTmY-0006U1-TV for grub-devel@gnu.org; Wed, 12 Apr 2023 02:16:40 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cb8q1yZHmb+6GBQj4gDZe/5JCES78rGtEWmx9DGo1bw/J6LL7s8OncuPutZfaF/ykyxnhME7qUpOUqUQkNX0JBmM5Rps9Acaggoy+0m9wVDBW4X+McfGJSnVzNNKp6QRyaADCfn/EoKunRk4z72zTu3AzFxncPROX5ARfpbDqnhX4S2CxeArv56rNOrWsSrANHRBP3hdgV8kk1s+j7wXFYvpb43S+JjIeB024m3Gog5qpiYlmaqhlSnrmqYB5903i8sMqlJTJJS0ImY/yHwLA/I5FWLGxfpJThzo9HR0vsNyGP/W3RN3Kdo7jFAZfoZpu6d7HlOewdVcGM2Ru8jJ6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=atyNcncebyX9Qi7C4WswmlRzKMoI1LdmOrESgcKjd/E=; b=a0zI4PU7Q3e0U9Wo6hl8h7qqmk9LuxvycybVV1WpSYtq1KKXDSE0fjPbHLw1TA8oDW+N9tRbqr0F8F7fdGt6EmIyXsRDnLnQCqs5V//syWx6qiVn0WWhL/+qo/ShJAOSmqbZoJK4Q5Z7y42VKKkN6qG+SK842uRCYGqrDlUSuFaR4ZFTZFzmntjvTiWcrMMTydSYx8nr3wXHCrRIF5dw5tsaJDz3rIC/jfi/bHRBT9p9QaDO8kIhmCAOmpsZafsJBo8bKsnpfQSxGduVFltKwn51jW1uCkTvQXOlR7riUvSOGxR7nmkycTX/opU96rHPc8hK0iryQucabF8Z30oddA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=atyNcncebyX9Qi7C4WswmlRzKMoI1LdmOrESgcKjd/E=; b=GELd+zxR8BUonSRrjB+m8nEuZx3ZsrrZyP3lNpRl2lVpgvp7Q6WdkeLd9J5W2vn45f0U62RwG5OJoPljH0m3zFyGKGd2HqCk4q7B5hNJSiP9E22g5EF6S4Hpo8Lj2Yhk8RvS3zi32enxGePWZmv9QgmbupF+DcLK7XWm0UP7mtmqd/JDopBkRoH2GFVz/OFqU0rx3lvaoowhRFW+I08ObL4Hze5fGozc2nHIzBvr1sYNGkDkZhwUEul8Its7Phjbih9BAdoMiqoByZQXRIViZ97XOjY4mxMuQM0+jdAfhGK5YRtyxssBpSVk2PuQ5BOM+rvFpNi2QeT+RcQ7/jubJQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from DBBPR04MB6140.eurprd04.prod.outlook.com (2603:10a6:10:c7::18) by DU0PR04MB9297.eurprd04.prod.outlook.com (2603:10a6:10:354::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Wed, 12 Apr 2023 06:16:02 +0000 Received: from DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::8e45:fffd:c1eb:3ebd]) by DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::8e45:fffd:c1eb:3ebd%4]) with mapi id 15.20.6277.038; Wed, 12 Apr 2023 06:16:02 +0000 From: Gary Lin To: The development of GNU GRUB Cc: Hernan Gatta , Daniel Axtens , 'Daniel Kiper ' , shkhisti@microsoft.com, jaskaran.khurana@microsoft.com, christopher.co@microsoft.com, daniel.mihai@microsoft.com, rharwood@redhat.com, jaredz@redhat.com, development@efficientek.com, jejb@linux.ibm.com, mchang@suse.com Subject: [PATCH v3 01/12] posix_wrap: tweaks in preparation for libtasn1 Date: Wed, 12 Apr 2023 14:15:42 +0800 Message-Id: <20230412061553.7597-2-glin@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230412061553.7597-1-glin@suse.com> References: <20230412061553.7597-1-glin@suse.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: FR0P281CA0247.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:af::16) To DBBPR04MB6140.eurprd04.prod.outlook.com (2603:10a6:10:c7::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6140:EE_|DU0PR04MB9297:EE_ X-MS-Office365-Filtering-Correlation-Id: 2239fe62-0f11-4af5-3300-08db3b1d63b5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tN2J97oaa93XjJcRmxBqYR6Q+jywVw1UfA/uaGBe2AL1lzulaM7wPtzClfAkvtg6N/L23wZ+ytFrl4FTvjm0CullYEdmUzc2LvHadlBXltOb6C01aIsZ9ZlBUq9vGnQWf0D1yhGUGNuzfi58TZ+51OpNNlt1+7DmCc1hbM9ylWTtmf+428oZcr2ZvCntuZdztDYqi0wIDRH/fSRt8HrxAtoFekJ9TJprYKDBeV85ZFU2CDIcEVA5V0YX8K/xYb9Vkq1IMUSOL5yjbu7VxflkBdE/2BApLQdPSXWw+eE+TEi8B3J9YiKoaPLf1DWbTVUZzmiI7zrN24XM1fAbmgkYoTOJtjAUuexWMcM85TR67aCKQZvnIIP+bimSstwUfhjcdl9igqfVXn1w27Bj010YtBqsM9oP8i36xV3lh+yw/FzEMz6QnMfIyy/zNMV2amSvoKUgFIx3zVe2LHEDNrHHLWuuwGFu4XI/e09DSZAY/6IuX99MKQ3XzvYLK2xA1XrJ87Z+PRdkMLfZfsbw6b7zrSbsUACflrUMJMV1xRujnKO9s9X2PDfyeCBbdQLHnZv2 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR04MB6140.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(39860400002)(346002)(366004)(376002)(136003)(396003)(451199021)(478600001)(6916009)(4326008)(66556008)(66946007)(66476007)(5660300002)(54906003)(316002)(8936002)(8676002)(41300700001)(7416002)(38100700002)(83380400001)(186003)(2616005)(6666004)(107886003)(26005)(6512007)(1076003)(6486002)(6506007)(36756003)(86362001)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WOFiLMFWV0ujUvi4O378i1qOvHnApRQ+943mXcR/nT2bbLXugiSEUznmllbp?= =?us-ascii?Q?tQI/yqcz/e1Z56eQ8NoOegPFpmMpetbYKlbQj12rjiVJs8KLXr+XdWEBD1c1?= =?us-ascii?Q?N7gvy96zpAbkBm3eVeL/r+UrC78kW+cxlYKkjOg/krZquMiB7nk8j8NTdlpB?= =?us-ascii?Q?xZKF59QmCT40Lhnni5CudcgfSzDLasgP/sbAnrKRXyfOLX/Puy+4STaW+0oK?= =?us-ascii?Q?xlQp6ARYWJS2M/aES/0rXQQuxEBt00J8CAYhmb5HYx43Xq1OqMn4uKX8VMKo?= =?us-ascii?Q?3gwBbachA3pP1B4qAK6Yv2PUxGBZjjaRmKi7ewaPM1XYeQQZWUELN8jsZWDK?= =?us-ascii?Q?KkoDjUT2X5Jf0cDBax/nvaUQ1Qqp1hwB7jWEHgC4ftWkzvcJxLmOT/00Bphe?= =?us-ascii?Q?M6PJJKkoJm3uWbhVH9G54Xj9ETP+i8XYChAPR0UQLDqngLYDyqqSQg2q4Sak?= =?us-ascii?Q?Frn6U9/F1b2nx+rnaQOjSJD0a2kpEFch/leJ3s6Me2dvL5W06kPFaHomFIRI?= =?us-ascii?Q?sDvTFDimjJzPLkKhUnL4VJ9MeZU9xtzxleRpG5InGTNCSod2n5UZLhnT65eD?= =?us-ascii?Q?G5TnXf1yynDrwRy1FmltjxIMQhykQRj85pasKXYbRbVUCiSTj+AAitF5BKVs?= =?us-ascii?Q?ozWHaYjiPuawAa4sBncC+rnQDFJzsVPLv5M+9e2GrjiQ1fk0xuFOvoA5QgSm?= =?us-ascii?Q?Pc9WOmj1C5alxfHZdbSiGAg/K+CT4mSpcA3mxdXJm3twxeGtK+dHU0gpzRtd?= =?us-ascii?Q?+1q1Eez7yUHKfD+ZHORWowEyN2HyyxQGkgZCl9bSnW3mNc/f7HRLYCTlf6y8?= =?us-ascii?Q?opAYkfzi2gEPvyFx2mxlAaYkA3XNuAe3ZDQITbuS99iB8mv+TdPWHYlB79Ms?= =?us-ascii?Q?+nOrtZaNYMwD0CalHUOjvZfP/OBmGymL2AP5qWPuMt1PSrRwr8sLJBSgVay5?= =?us-ascii?Q?a8yDFUPLCrwk7kYfm6Fs3xI8iQs+ak7XPO2jgPwRtUAEVT9fgVhe3Vt2bPgo?= =?us-ascii?Q?DpZmdpx/QPSsStoa1MBorlCAKWWybKh3PrQYrtL3thKBqkQwCqd2YoSR5krz?= =?us-ascii?Q?5AnIvh6dx/v7PPkh8wXbLVa4Z1pIuakvwMtPsxUZ2ER9f+Fuce6U6CXyeJAc?= =?us-ascii?Q?PMx6Cv1fpudtFJDGhE1ntHOMCqzMQx/rx6SAr2RZrd9pFnBDAffknfMADD35?= =?us-ascii?Q?XGTp8fumGIpw6Q4MqfnWW6hvZ/HfoYdHqahlPCjCKE/mbx/dQLw5PtZe6fND?= =?us-ascii?Q?gmivEeHU1xlOfZWy/YvyhKlynQtQEqspqKxL/OvfXsgQZoO82iW8rSutaO9w?= =?us-ascii?Q?AjyfrJIXW/sHRbnuQntMB0cP/5Z7NkCtNPC+4EYeQCjI/cdCzH+C9/2LCQIC?= =?us-ascii?Q?lqLz6TJcxt2mQKCgSCrwnuM8pAwPZE3RWlEJsO/EGWNQjRQr0VX65Hu48jeh?= =?us-ascii?Q?TPdLAy+wIrhSZpzpj6/DH8Nvb7sDwVBBMmJ6CHHuS4OQvhVKHaQ7dmNCblnX?= =?us-ascii?Q?sURqRcivF/f/kovVR0ZPtfW033eagRl7WR3zQDeXo07TDhB8sJ117T61YBbH?= =?us-ascii?Q?OfFZySwcfRa1YBj7gF0=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2239fe62-0f11-4af5-3300-08db3b1d63b5 X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6140.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2023 06:16:01.9680 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: C2DJWz6ACM4qZnbUL2Bjcs8FcISGpDcQjxJ60rxO8e5rXsyYk/+LWwt27+MUpbPf X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9297 Received-SPF: pass client-ip=40.107.14.81; envelope-from=GLin@suse.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, RCVD_IN_VALIDITY_RPBL=1.31, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Apr 2023 06:16:41 -0000 X-List-Received-Date: Wed, 12 Apr 2023 06:16:41 -0000 From: Daniel Axtens - Define SIZEOF_UNSIGNED_LONG_INT, it's the same as SIZEOF_UNSIGNED_LONG. - Define WORD_BIT, the size in bits of an int. This is a defined in the Single Unix Specification and in gnulib's limits.h. gnulib assumes it's 32 bits on all our platforms, including 64 bit platforms, so we also use that value. - Provide strto[u]l[l] preprocessor macros that resolve to grub_strto[u]l[l]. To avoid gcrypt redefining strtoul, we also define HAVE_STRTOUL here. Signed-off-by: Daniel Axtens Signed-off-by: Gary Lin --- grub-core/lib/posix_wrap/limits.h | 1 + grub-core/lib/posix_wrap/stdlib.h | 8 ++++++++ grub-core/lib/posix_wrap/sys/types.h | 1 + 3 files changed, 10 insertions(+) diff --git a/grub-core/lib/posix_wrap/limits.h b/grub-core/lib/posix_wrap/limits.h index 26918c8a0..4be7b4080 100644 --- a/grub-core/lib/posix_wrap/limits.h +++ b/grub-core/lib/posix_wrap/limits.h @@ -41,5 +41,6 @@ #define LONG_MAX GRUB_LONG_MAX #define CHAR_BIT 8 +#define WORD_BIT 32 #endif diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h index f5279756a..14e4efdd0 100644 --- a/grub-core/lib/posix_wrap/stdlib.h +++ b/grub-core/lib/posix_wrap/stdlib.h @@ -64,4 +64,12 @@ abort (void) grub_abort (); } +#define strtol grub_strtol + +/* for libgcrypt */ +#define HAVE_STRTOUL +#define strtoul grub_strtoul + +#define strtoull grub_strtoull + #endif diff --git a/grub-core/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h index eeda543c4..2f3e86549 100644 --- a/grub-core/lib/posix_wrap/sys/types.h +++ b/grub-core/lib/posix_wrap/sys/types.h @@ -50,6 +50,7 @@ typedef grub_uint8_t byte; typedef grub_addr_t uintptr_t; #define SIZEOF_UNSIGNED_LONG GRUB_CPU_SIZEOF_LONG +#define SIZEOF_UNSIGNED_LONG_INT GRUB_CPU_SIZEOF_LONG #define SIZEOF_UNSIGNED_INT 4 #define SIZEOF_UNSIGNED_LONG_LONG 8 #define SIZEOF_UNSIGNED_SHORT 2 -- 2.35.3