Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1ppOXF-0002jt-RK for mharc-grub-devel@gnu.org; Thu, 20 Apr 2023 03:16:53 -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 1ppOXE-0002fh-4R for grub-devel@gnu.org; Thu, 20 Apr 2023 03:16:52 -0400 Received: from mail-he1eur04on2053.outbound.protection.outlook.com ([40.107.7.53] helo=EUR04-HE1-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 1ppOXC-00028Q-34 for grub-devel@gnu.org; Thu, 20 Apr 2023 03:16:51 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dcDhD6kTfDtjN+KrLkwZlAMpaytcHmt5qzx84TGO9wzWHBIiL7bWuhMJPBm+qk4kIHZr5kaxN1W/R1tQyEqaHttHR0p7kuSkjDlHdYVwWinvgJOx32ysX1HU2HU3wXAsyy0xw9mxor0J/D7YFOduwbdAk/HJfkcmrL48B3wfD20cqx8fvl2EjBPendrOnWFmJ2O6hZVtGnzT6J1TZebaU2978w2EU8Ohzj4MwvDwHB7EVy8KsJpfvMsTg5w7zsqsBEXnwkkhFdmhywX3co8bhmPLe3EmjvzAwBDU0tjGbfjJ6tMQ6Iv+WXwQ4ppR213RGbHW9vXOsvnLxzrMVBJcpw== 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=AfCEw7sY+eHyOusKoJ6b8Z39t3oAsWgsu4i8KDhMoivrZG0WKqfWbk739EzQza7cK7+Wwnd5i8zmcUSX11eKbhCBt8Sm8VNndOsBC5EkZDpinKrsIGLjzLNgvhgBZh/fU84wwb3eUeFSsLVwkV0BDxbeDSO31VtsLyuSbGtnkIG+ix2ED/2TcloY+GhQ0daGV+ZDngBGanYUqil8CYGPI44o9QQcmkw5k8HQlqy8ivLPHCqbQQsX6UMS9VP1z3aHPHDvW/Ze4jmBoIrbUsE+cp2SzdBCEaBvTSzh27N2VmDQ7uBs8Zjm3+LfdSe52CmHpyyUHSFoQtoA/hY3SKTYDw== 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=5BnHjoZbiK18a6hE0pe7/auiP25kFhLVk2lgj5hvdrgruMzOfN0bQ8r+HEmlLeTm1lqL9fCDzg5jYG7iwBNzvUF8neZIHp0AxC3y/Nd0B9HjS8Ph6BmJtvGZkgGW4x3xEpcNogZBCiqjfeLF0ThuRbMIwxoDFanqi1OUwQdOjRcu3DMVMfawCtXJxPil3pdAZtcfTP34BzCuc3mi0NVYBK8ozT3nx9WSDixBqQFXW0kBo4HY/JjMM4puPHxQp5dMfu3NObGAfmOSJMON6yOKzY9UlMo2s5c7T6j4TzPbqpZat3QphX8D44PisnF6yMjtHF+WJbrjiB4RW+BVHuD5yA== 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 PAXPR04MB8094.eurprd04.prod.outlook.com (2603:10a6:102:1c1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.22; Thu, 20 Apr 2023 07:16:12 +0000 Received: from DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::dc0f:b8e1:84c9:2906]) by DBBPR04MB6140.eurprd04.prod.outlook.com ([fe80::dc0f:b8e1:84c9:2906%6]) with mapi id 15.20.6298.045; Thu, 20 Apr 2023 07:16:12 +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 v4 01/12] posix_wrap: tweaks in preparation for libtasn1 Date: Thu, 20 Apr 2023 15:15:37 +0800 Message-Id: <20230420071548.28286-2-glin@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230420071548.28286-1-glin@suse.com> References: <20230420071548.28286-1-glin@suse.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: TYCP286CA0152.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:383::14) To DBBPR04MB6140.eurprd04.prod.outlook.com (2603:10a6:10:c7::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DBBPR04MB6140:EE_|PAXPR04MB8094:EE_ X-MS-Office365-Filtering-Correlation-Id: 189f372c-184f-405e-2010-08db416f1ee9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oGjHNtG76GmvhjvidxtId1P/gDv54H+0DklvSur+xJj6iuWjF8AePxUVfq19PrVB701IrTQKryrDytnQ8Y/b+690T15IjtnKJe+fYMIrppSyV2WvSS0GYQeSFCvNZdfGsGYIQzDwykWzXrAEi/5Jxj94HeOA8ilxNy45k7I3bK1kihkBE8bpX62kX2kpDMgOtdGviy9/O5CQKpzJWTcBBziTzDS5kEbD2LDmaFWn66aJQlufdosehwSzNotdggOZYIRY+A2Da+Dr5H9Voj1UuTBDTyGp+6LIXn8F790vLOK9ZSxOfIJx0MVdDi+/AKj1DBnQWuNVlfrLyEn1ZCMSJqEDC2Xwy5j9cTvUQU/PpotumEC+Mdd1+t7QxcC9NrolwvCBSSucsncVxDZigvH0AhM5r29ivcA+yu7MuGkLWvBqG3BCiptc7bUKMTXvWeTdI/PJBQPY7JbA3KhYZZnLYwbB+tpgMDlTGAEG7ISjQ2mWJ2oTYEGjlUq43qUciYs2mYJD8ZCW/MzIWULEG0uDj5joptlzJHypI2whN/qJZXBj50AJHC3/WCt7OMlT3y37 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)(136003)(39860400002)(366004)(396003)(346002)(376002)(451199021)(6916009)(26005)(6512007)(186003)(4326008)(316002)(6506007)(1076003)(8676002)(8936002)(2906002)(36756003)(86362001)(5660300002)(7416002)(478600001)(6666004)(54906003)(83380400001)(41300700001)(2616005)(38100700002)(6486002)(66556008)(107886003)(66476007)(66946007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HFMX1x3wwPMxCrnsOIonZJcJigep5BG60UdicCBXFmltXXjlpc9zd6F1GRQ0?= =?us-ascii?Q?U2ALwCjG1RloiG4EHBO9rAoRd0o7PspjQ5WgyZ7VHwlNmFtCZBd3ZHgPnb2w?= =?us-ascii?Q?eFLRt8Z+7jkBGo7UmiBMa0f3RFcsJ92vvra2ZVaHE1al5OytAISgZS4mMz9u?= =?us-ascii?Q?uDDdxdhikIujDNjA5dPOgcys+sfB9T3cNp5YjtgX7ojY6+irdl1JJq4Epfu0?= =?us-ascii?Q?03NjP4uF7Jz2Ktif1fT5Ni81XsNeNQhjmQLoJgqQian2pR7iXdUOYOtGKLoM?= =?us-ascii?Q?A04qplo1lIY0WU8SIRSYR2TBCJZ1CoNUuYcyuBX7Tj8JStq0qBSwQO4oT14K?= =?us-ascii?Q?fLMLVSBzcoCXCMEm+9e1Cf1nWQKUftm9iGy2aiRp5K+073UXHrCdBPlHYEq0?= =?us-ascii?Q?RIccUfSuUWeUAfUk+QRMPJIuYmPiQZEd971/iPPdEaPrephOUWh7f98w9hGu?= =?us-ascii?Q?padPA3LSkQxH7hGURUR/x+g07EHU4tYM0D4LGQE6anh528HnIAQzUyJpJikk?= =?us-ascii?Q?wMrNOxXtpIJiPEGuqNvc3sTkub//d17nbNWx9/Ulca7h8/v4uQvJJHE1TKXy?= =?us-ascii?Q?51hgn7a9uUlycJ+hc0JE2+fHbdL0hX4d8U2xv+fTvLyGXzPHBwcQP+FRF7/3?= =?us-ascii?Q?8khOONHj+vIIkqHAxXC5Nk0jPdy/gW09RGgDInlhP/lfdvcTD+q5SWznTnYp?= =?us-ascii?Q?yIwt512AeKgf6rgeF6gmxZXRbReNOaV5jaSp3hycm2mxAZSrs1Jrxqt5Xkdr?= =?us-ascii?Q?BLUgdIsPTKJPrUnkKtoP4huteGuFFbEuC30OWkPCwf7Cq54GsVn57EQe3Eks?= =?us-ascii?Q?zzINll/koXOL0XHzD8ej7iAG+Ceif5Uvz7bGjDIV0q5+jP8DTa78dnxEJY3w?= =?us-ascii?Q?PKUwon8g2LqEfLSsYWjhHDHCYORKeNo2fQbi2t39eyVPs1A3bSBlYsKzdgN0?= =?us-ascii?Q?to6Rk1XF8c7JHxhctmEN5zQnn2hQvHezel8d7sgHm3k1WskYH5+u+yajCU1b?= =?us-ascii?Q?ZJ62W4reKsVIlN2EH3N8FhmUzk+ZU7P4gaHvabn/TUNHNeQsdIjoWvDit75v?= =?us-ascii?Q?ijqDmZ1q4NrmQZPnRHd3YJ6Kn+cx5n2LY0aFVCx2hIXtw2TdetOewUlZlMCy?= =?us-ascii?Q?GVT8toIIgeX3U1ZOwNq8Y+OikcAMY4fxHMY4cddY02u+qkamzZ6yQlJuirfT?= =?us-ascii?Q?U3nYR6ZPuu2PYGKEkuv+SCu3kGfqM7L4qke9fkLcx1bT803i2HLfUR5v02pQ?= =?us-ascii?Q?TkrNY3Ic8Y0hYR9T/INeXGZU296W/QZFaBafksnHZjnMcRoteycUnsl4h8FH?= =?us-ascii?Q?7mo7Kj+V8aptBVIP5YxlgGQ2XfSKpGUI0GUQrfpavwPQLY1CkTngxQK3t+tK?= =?us-ascii?Q?zQ+YgP91DQEmejouUM1gHiuXNn0+K6Uje1ipU48F3pHDsH46aSAekUFWoMk+?= =?us-ascii?Q?eNf/bdf2OA7D9Sy0j84Nx45Rqf6PqQ2H3ANpVDDBb+QNpjQuh7IiM1q05E/t?= =?us-ascii?Q?Z9jPiFdwDkSivgAmrIsDnZNYJe/AkxtVZxSzs5PP6zGh3bXatqT2Sk6OTEpb?= =?us-ascii?Q?EdHKCndvfr4dceAdp28psMkJX6VclF+TcUfzXDDM?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 189f372c-184f-405e-2010-08db416f1ee9 X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB6140.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2023 07:16:12.0093 (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: 5rWrVVujc2eEye8z/oPHXFUBK8nKyifrxTS3nHWb7JR6WtOLlo1Cwl/za2h+2Xwk X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8094 Received-SPF: pass client-ip=40.107.7.53; envelope-from=GLin@suse.com; helo=EUR04-HE1-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, T_SCC_BODY_TEXT_LINE=-0.01 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: Thu, 20 Apr 2023 07:16:52 -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