Re: [PATCH v2 10/22] posix_wrap: tweaks in preparation for libtasn1

[Stefan Berger]

On 6/30/21 4:40 AM, Daniel Axtens wrote:
>   - 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 <dja@axtens.net>


Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>


> ---
>   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 7217138ffd6b..591dbf3289d8 100644
> --- a/grub-core/lib/posix_wrap/limits.h
> +++ b/grub-core/lib/posix_wrap/limits.h
> @@ -37,5 +37,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 7a8d385e973a..4634db09f294 100644
> --- a/grub-core/lib/posix_wrap/stdlib.h
> +++ b/grub-core/lib/posix_wrap/stdlib.h
> @@ -58,4 +58,12 @@ abs (int c)
>     return (c >= 0) ? c : -c;
>   }
>   
> +#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 854eb0122efa..f63412c8da06 100644
> --- a/grub-core/lib/posix_wrap/sys/types.h
> +++ b/grub-core/lib/posix_wrap/sys/types.h
> @@ -51,6 +51,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