Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1petYw-0002zj-P3 for mharc-grub-devel@gnu.org; Wed, 22 Mar 2023 04:11:14 -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 1petYv-0002z5-F1 for grub-devel@gnu.org; Wed, 22 Mar 2023 04:11:13 -0400 Received: from mail-ve1eur01on2044.outbound.protection.outlook.com ([40.107.14.44] 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 1petYs-0002y4-Bf for grub-devel@gnu.org; Wed, 22 Mar 2023 04:11:13 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=STt0voDcOpUlayzUtVWiCO3+RpDSsQbSOneBKhg9N3mTmTxVrIouE6cETjforaVP90o0MyWupFM6IW5eEoml2yU55h8B9DcSv4RRR7xVYI0ZZHFYKD3NDSpXbRNhb9+l2BG3fCrcs1ZXs1/RLvoCVMmkS5CE8y1mmIoc5JHBuEQrqEJPWi7cfRorgdA+I28ypQjpcijTdntWzbUHfVE3IZEARdY6xh/WEYvOqGygjSC52oNN963rOqh33PO98Xe7AUueSCs8nOQ4fN3R4sXdxqy4JqWR2fyvwwSrfKNLTV4QRcHaaVA8/vGFBEwPEfbmMwaNaoBLSy4bukG1qEL/Iw== 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=LVkYRWT/tLzPiEXp7GIN7moC7MLYs+JeYflfnQGqY1QuwN66HW14HB8NXNrvYWn3pmVdW+YPGXN05L627J2EqRnza15xMnaUWMw2kFcGGOIdqy30o13kZeoLYkQzn6SIcbpigkSIo34Qo21VkT06k8Rjs2NYMdiXDHAmKCAGYvSYw9MeqleuAYvOd/awZm1ofzmy0HL9tN4ybnAHz6ejK+IHs+SymsvrPJgJLv3zeM0PprMjwvbd0ICPBmxdLf/FScGQcEIILMuyqS5X41TytK+pQC9tn6s4y8iB7XPrZ8nKh0zMzj1tdpWIWujNKr6UA2sGzUp+ZjxAfHDtmwFHuQ== 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=oVFBStv+iclnByIpubZoUsXtVd8ssTuXgJt+7v0EBzmfN530+YcBW0PJ31CBRSgqOFxueqAV0KGuJfXnJDWE0Bm8X7n2Lmhxoki/lFZOJz44H6tQmkjKzncgRqh7fbn+Au7VZ6B3LWZQKaesJicF9wI2JJXkmJZn2IDMIAfO22+IsZVW4Uf8XFshTL5hLFHS9wnKd9uvjqzyjWXY2SKj4M8ZQ4gOG4LSZGAQLo9UOLSBpYl3gcb518xWtHlxBsju1W/d2mBLd8coWMtTZlo9AyKTyYzQNCthumHlEcHN6RsYRIR+M+fRzshqyPU+4a6K9Rxlc9paFsRV7Y0UBsnexw== 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 VE1PR04MB7360.eurprd04.prod.outlook.com (2603:10a6:800:1a3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.37; Wed, 22 Mar 2023 08:10:33 +0000 Received: from DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::688f:bc10:59e2:772a]) by DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::688f:bc10:59e2:772a%6]) with mapi id 15.20.6178.037; Wed, 22 Mar 2023 08:10:33 +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 v2 01/11] posix_wrap: tweaks in preparation for libtasn1 Date: Wed, 22 Mar 2023 16:10:06 +0800 Message-Id: <20230322081016.12075-2-glin@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230322081016.12075-1-glin@suse.com> References: <20230322081016.12075-1-glin@suse.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: TYCPR01CA0192.jpnprd01.prod.outlook.com (2603:1096:400:2b0::15) To DBBPR04MB6140.eurprd04.prod.outlook.com (2603:10a6:10:c7::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6140:EE_|VE1PR04MB7360:EE_ X-MS-Office365-Filtering-Correlation-Id: 61e458fc-1671-4d37-54e7-08db2aace87a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4vpJezoQwhujwGeCtsF/mwUcCG04q/VTynD1fPrdwg0VuXJ0SJ6maBAHfmzyKmljUVosEDc9PnvA2O0JIWmdjhajnSkWQ+f1FBiVV7swxgFUvmlV8mx//1WFM6PllhAt39ZkYgaOY5J/r9hdebs+FhdloqtbkDEOVAjhjycF+EMMsLE/nMXZsRh+ACxci1ra22YN8D54mkDOz4sit4XGmuNm4Oiw2vxdtlpdYGBGr/n4+niZz7ljo/4zJfk+j/ZPDAnRyWb5SNuSCiGaTOUnKvDBsUDXC735zbgBbuKffT+sOSMBFwXCUnWrV6iS+KZikvY+ndMLcjBreNDtTtt1yzF+rqy9NR3XLDrUu6GTVS9fEv3+lDkd75yu4CimNdNMGTaUGBxSWF6tl74zEx941nP8vzJCsIR/WPmPc+XKXrDldQw6LWzTseG/hhvKV9oZK7XAukKj6f0RHbBQvGtHARrEdK8ZoxIMx8hiuevi+00YSYSiBEWjEDE6i8mYAhqcpkQPlhCbDr+YMD3eBmPVa0FdtgQmtbRkA/tS2DSfzdyaBBVZex8Cmi8ySDnXYCSg8eonwqfVWlJRfLNskXnTvmI2BZnYJYfdr76Npv7S+Vi8paIodEyiVSb3wiTrbzYBcttWIf36DvdWwzrkJKhxpA== 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:(13230025)(366004)(39850400004)(346002)(396003)(136003)(376002)(451199018)(2616005)(6666004)(107886003)(6512007)(6486002)(186003)(1076003)(26005)(83380400001)(6506007)(54906003)(38100700002)(2906002)(478600001)(86362001)(4326008)(316002)(8676002)(66946007)(8936002)(7416002)(66556008)(66476007)(5660300002)(41300700001)(36756003)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wpSGmpIHgd+vPFYdKCNpnFYcvMWmYci4QtcrmeFu+jpCMJcUKBOu0fNyFWv9?= =?us-ascii?Q?YC71PcDWuTTylphxfQAKymvTgUPqjoE1T2yTWdaQysyZD6bLplAmvmvrcwd5?= =?us-ascii?Q?tTGvK7Koa04X6khmjTpCopHN+8b0WrCtmJKyMDTurcdJRPYQU/pGyZ5mbsdw?= =?us-ascii?Q?IvRT5zvmms2qC/+qx6IBWz0C74W8rNUFXYtlPlSb+d2ouGoqqs7SaYL3JSPv?= =?us-ascii?Q?265/zyZjML24G0ChO0TGmDeBgbqUbKEUSzAz1bzIagHqtc5zndeDEkWNJEBD?= =?us-ascii?Q?NbxMJSclLJCV2q1Evtr5bq05z5yMlcjREchwya1e8SXt7AlUYV1ElW0UShac?= =?us-ascii?Q?Dg5qcccMKL40gCiY7XAvOZEDWeYL7c0hF4TvfU8YNHjHkj2Nu4U1TM3G+zIX?= =?us-ascii?Q?uDTQvvJua17QO/p7rpkew0nf4tW5QCDxKP7pmM44jUsJwdAaOt+WQnm61yXJ?= =?us-ascii?Q?tP/16Q1QDCzZTb9n/CKwKg/eMmeQFnU6ZyxV8wGhkxTQDXjWUVHAEjofc+Tg?= =?us-ascii?Q?STueuQxtoPaAa6B2GUsOvchRfz3yU0HDMmrdLFLOknRZw5PzmSMUTQnUhMtX?= =?us-ascii?Q?04QirmrIcRhTfUCko26ArH+q8012xq6mNCZTuYtDSxEy7OTRUBQmQK7Ba/GQ?= =?us-ascii?Q?0DTu/8/QZ074Fc8zJ0pa5nPwNLht4/Na5zjKCsXL9QIrtcosx0MjKAB9XC3e?= =?us-ascii?Q?HRj+d65lVmzZ82CvZubGVexD7tZ7yizVsCqJHhecEnDeZvNbcbfDS93eauJT?= =?us-ascii?Q?1Ov9xT4q0w0oqyI6g78TVfhzgF/xQYC46hL1C9UnfJiBTEJ4mIJgIyJ+vuQR?= =?us-ascii?Q?5U4zE40W8dnR34gp83W8yrgXUNrE6zzzicKlxAOFkK8hz+4+RvkGBTq61Ukz?= =?us-ascii?Q?hUMp2qvB9HVE1OJjzFgA+EPoEbWk2TJOCg+iajxwELPbY7OuoRReFt0vvl6M?= =?us-ascii?Q?IlpgWzU5wbmzdpcIWC9ZSYyeJnLpGttcyFlDSIiEdsSiT+Loc3soQHvwHD0o?= =?us-ascii?Q?HttzdtWmKgAI8D9Fle98r3VanySTX+G2j/szdFac263q89iMvqWACWdUjshZ?= =?us-ascii?Q?CM6FMG5+wd7tQA0cWaFq2ic0T1NcTh6ddchr5ZUJkK89FlH0kNU4HcZE1D3y?= =?us-ascii?Q?segmG+zjYYY4PpA+/aStnwybqr5rSKCqFCw4VDBg97GCb+/zunjLBC3Cczjv?= =?us-ascii?Q?lImvDq20FNNX0kSO70YkUFof3BezAIzMrw65EZChoOvXY46YIgXgcuAp4cef?= =?us-ascii?Q?zZBCpP3hOBsdIEKwUy4SPkw//SLyekJRMt71pS8dnJED2YTlDlBA0zoyTeDk?= =?us-ascii?Q?5Dgr5I2bTMxi1hwEviVbSPWGwVKzFurYdSxWMCSPgsUW0LY37jvc5hp3cWMD?= =?us-ascii?Q?HXtTQI+r3TztHEfX9F3M5E4EC2rhiIhDc7+DJ9VW5gx0zfco32j01UOr56Az?= =?us-ascii?Q?iUYKQX8QAPNi75bYL1CO2LjyzFC5m9fJk9GZpkTP7jHKGK+iny5Uiod6R4Rx?= =?us-ascii?Q?ilcQU/uiKBgVflag3JR1TwL+bdWZueWMa62371EvQ1AyjWmyBJn9sc9kpTvB?= =?us-ascii?Q?WGMJybtQb3OqkXxTuDUAxxqLf5iG/Z6u0QCpQlyY?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 61e458fc-1671-4d37-54e7-08db2aace87a X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6140.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2023 08:10:33.0192 (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: Zz7Z6O/K1NK3i0k2bGzplvmob0/qyY5wxUYAdh/w1VKJJqSzGWzDY7GSWv8y44dL X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7360 Received-SPF: pass client-ip=40.107.14.44; envelope-from=GLin@suse.com; helo=EUR01-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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, 22 Mar 2023 08:11:13 -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