mirror of https://github.com/MidnightCommander/mc
Add some files and code rom Gnulib as preparation to TAR updates.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
parent
0775539b08
commit
72d0b4f878
|
@ -1,3 +1,4 @@
|
||||||
|
m4_include([m4.include/gnulib/mc-gnulib-common.m4])
|
||||||
m4_include([m4.include/gnulib/mode_t.m4])
|
m4_include([m4.include/gnulib/mode_t.m4])
|
||||||
m4_include([m4.include/gnulib/stat-size.m4])
|
m4_include([m4.include/gnulib/stat-size.m4])
|
||||||
m4_include([m4.include/gnulib/fstypename.m4])
|
m4_include([m4.include/gnulib/fstypename.m4])
|
||||||
|
@ -13,6 +14,7 @@ m4_include([m4.include/ax_check_compile_flag.m4])
|
||||||
m4_include([m4.include/ax_append_flag.m4])
|
m4_include([m4.include/ax_append_flag.m4])
|
||||||
m4_include([m4.include/ax_append_compile_flags.m4])
|
m4_include([m4.include/ax_append_compile_flags.m4])
|
||||||
m4_include([m4.include/mc-cflags.m4])
|
m4_include([m4.include/mc-cflags.m4])
|
||||||
|
m4_include([m4.include/mc-stdckdint.m4])
|
||||||
m4_include([m4.include/ax_gcc_func_attribute.m4])
|
m4_include([m4.include/ax_gcc_func_attribute.m4])
|
||||||
m4_include([m4.include/mc-check-search-type.m4])
|
m4_include([m4.include/mc-check-search-type.m4])
|
||||||
m4_include([m4.include/mc-get-fs-info.m4])
|
m4_include([m4.include/mc-get-fs-info.m4])
|
||||||
|
|
|
@ -243,6 +243,8 @@ dnl This macro is redefined in m4.include/gnulib/sys_types_h.m4
|
||||||
dnl to work around a buggy version in autoconf <= 2.69.
|
dnl to work around a buggy version in autoconf <= 2.69.
|
||||||
AC_HEADER_MAJOR
|
AC_HEADER_MAJOR
|
||||||
|
|
||||||
|
mc_CHECK_HEADER_STDCKDINT
|
||||||
|
|
||||||
|
|
||||||
dnl ############################################################################
|
dnl ############################################################################
|
||||||
dnl Check for types
|
dnl Check for types
|
||||||
|
|
|
@ -16,6 +16,8 @@ endif
|
||||||
SUBLIB_includes = \
|
SUBLIB_includes = \
|
||||||
event.h event-types.h \
|
event.h event-types.h \
|
||||||
filehighlight.h \
|
filehighlight.h \
|
||||||
|
idx.h \
|
||||||
|
intprops-internal.h
|
||||||
mcconfig.h \
|
mcconfig.h \
|
||||||
search.h \
|
search.h \
|
||||||
skin.h \
|
skin.h \
|
||||||
|
@ -52,6 +54,9 @@ if CHARSET
|
||||||
libmc_la_SOURCES += charsets.c charsets.h
|
libmc_la_SOURCES += charsets.c charsets.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
EXTRA_DIST = \
|
||||||
|
stdckdint.in.h
|
||||||
|
|
||||||
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
|
AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
|
||||||
|
|
||||||
libmc_la_LIBADD = \
|
libmc_la_LIBADD = \
|
||||||
|
|
|
@ -0,0 +1,144 @@
|
||||||
|
/* A type for indices and sizes.
|
||||||
|
Copyright (C) 2020-2024 Free Software Foundation, Inc.
|
||||||
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
|
modify it under the terms of the GNU Lesser General Public
|
||||||
|
License as published by the Free Software Foundation; either
|
||||||
|
version 2.1 of the License, or (at your option) any later version.
|
||||||
|
|
||||||
|
The GNU C Library is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public
|
||||||
|
License along with the GNU C Library; if not, see
|
||||||
|
<https://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#ifndef _IDX_H
|
||||||
|
#define _IDX_H
|
||||||
|
|
||||||
|
/* Get ptrdiff_t. */
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
/* Get PTRDIFF_MAX. */
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
/* The type 'idx_t' holds an (array) index or an (object) size.
|
||||||
|
Its implementation promotes to a signed integer type,
|
||||||
|
which can hold the values
|
||||||
|
0..2^63-1 (on 64-bit platforms) or
|
||||||
|
0..2^31-1 (on 32-bit platforms).
|
||||||
|
|
||||||
|
Why a signed integer type?
|
||||||
|
|
||||||
|
* Security: Signed types can be checked for overflow via
|
||||||
|
'-fsanitize=undefined', but unsigned types cannot.
|
||||||
|
|
||||||
|
* Comparisons without surprises: ISO C99 § 6.3.1.8 specifies a few
|
||||||
|
surprising results for comparisons, such as
|
||||||
|
|
||||||
|
(int) -3 < (unsigned long) 7 => false
|
||||||
|
(int) -3 < (unsigned int) 7 => false
|
||||||
|
and on 32-bit machines:
|
||||||
|
(long) -3 < (unsigned int) 7 => false
|
||||||
|
|
||||||
|
This is surprising because the natural comparison order is by
|
||||||
|
value in the realm of infinite-precision signed integers (ℤ).
|
||||||
|
|
||||||
|
The best way to get rid of such surprises is to use signed types
|
||||||
|
for numerical integer values, and use unsigned types only for
|
||||||
|
bit masks and enums.
|
||||||
|
|
||||||
|
Why not use 'size_t' directly?
|
||||||
|
|
||||||
|
* Because 'size_t' is an unsigned type, and a signed type is better.
|
||||||
|
See above.
|
||||||
|
|
||||||
|
Why not use 'ssize_t'?
|
||||||
|
|
||||||
|
* 'ptrdiff_t' is more portable; it is standardized by ISO C
|
||||||
|
whereas 'ssize_t' is standardized only by POSIX.
|
||||||
|
|
||||||
|
* 'ssize_t' is not required to be as wide as 'size_t', and some
|
||||||
|
now-obsolete POSIX platforms had 'size_t' wider than 'ssize_t'.
|
||||||
|
|
||||||
|
* Conversely, some now-obsolete platforms had 'ptrdiff_t' wider
|
||||||
|
than 'size_t', which can be a win and conforms to POSIX.
|
||||||
|
|
||||||
|
Won't this cause a problem with objects larger than PTRDIFF_MAX?
|
||||||
|
|
||||||
|
* Typical modern or large platforms do not allocate such objects,
|
||||||
|
so this is not much of a problem in practice; for example, you
|
||||||
|
can safely write 'idx_t len = strlen (s);'. To port to older
|
||||||
|
small platforms where allocations larger than PTRDIFF_MAX could
|
||||||
|
in theory be a problem, you can use Gnulib's ialloc module, or
|
||||||
|
functions like ximalloc in Gnulib's xalloc module.
|
||||||
|
|
||||||
|
Why not use 'ptrdiff_t' directly?
|
||||||
|
|
||||||
|
* Maintainability: When reading and modifying code, it helps to know that
|
||||||
|
a certain variable cannot have negative values. For example, when you
|
||||||
|
have a loop
|
||||||
|
|
||||||
|
int n = ...;
|
||||||
|
for (int i = 0; i < n; i++) ...
|
||||||
|
|
||||||
|
or
|
||||||
|
|
||||||
|
ptrdiff_t n = ...;
|
||||||
|
for (ptrdiff_t i = 0; i < n; i++) ...
|
||||||
|
|
||||||
|
you have to ask yourself "what if n < 0?". Whereas in
|
||||||
|
|
||||||
|
idx_t n = ...;
|
||||||
|
for (idx_t i = 0; i < n; i++) ...
|
||||||
|
|
||||||
|
you know that this case cannot happen.
|
||||||
|
|
||||||
|
Similarly, when a programmer writes
|
||||||
|
|
||||||
|
idx_t = ptr2 - ptr1;
|
||||||
|
|
||||||
|
there is an implied assertion that ptr1 and ptr2 point into the same
|
||||||
|
object and that ptr1 <= ptr2.
|
||||||
|
|
||||||
|
* Being future-proof: In the future, range types (integers which are
|
||||||
|
constrained to a certain range of values) may be added to C compilers
|
||||||
|
or to the C standard. Several programming languages (Ada, Haskell,
|
||||||
|
Common Lisp, Pascal) already have range types. Such range types may
|
||||||
|
help producing good code and good warnings. The type 'idx_t' could
|
||||||
|
then be typedef'ed to a range type that is signed after promotion. */
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/* In the future, idx_t could be typedef'ed to a signed range type.
|
||||||
|
The clang "extended integer types", supported in Clang 11 or newer
|
||||||
|
<https://clang.llvm.org/docs/LanguageExtensions.html#extended-integer-types>,
|
||||||
|
are a special case of range types. However, these types don't support binary
|
||||||
|
operators with plain integer types (e.g. expressions such as x > 1).
|
||||||
|
Therefore, they don't behave like signed types (and not like unsigned types
|
||||||
|
either). So, we cannot use them here. */
|
||||||
|
|
||||||
|
/* Use the signed type 'ptrdiff_t'. */
|
||||||
|
/* Note: ISO C does not mandate that 'size_t' and 'ptrdiff_t' have the same
|
||||||
|
size, but it is so on all platforms we have seen since 1990. */
|
||||||
|
typedef ptrdiff_t idx_t;
|
||||||
|
|
||||||
|
/* IDX_MAX is the maximum value of an idx_t. */
|
||||||
|
#define IDX_MAX PTRDIFF_MAX
|
||||||
|
|
||||||
|
/* So far no need has been found for an IDX_WIDTH macro.
|
||||||
|
Perhaps there should be another macro IDX_VALUE_BITS that does not
|
||||||
|
count the sign bit and is therefore one less than PTRDIFF_WIDTH. */
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* _IDX_H */
|
|
@ -0,0 +1,399 @@
|
||||||
|
/* intprops-internal.h -- properties of integer types not visible to users
|
||||||
|
|
||||||
|
Copyright (C) 2001-2024 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify it
|
||||||
|
under the terms of the GNU Lesser General Public License as published
|
||||||
|
by the Free Software Foundation; either version 2.1 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#ifndef _GL_INTPROPS_INTERNAL_H
|
||||||
|
#define _GL_INTPROPS_INTERNAL_H
|
||||||
|
|
||||||
|
#include <limits.h>
|
||||||
|
|
||||||
|
/* Pacify GCC 13.2 in some calls to _GL_EXPR_SIGNED. */
|
||||||
|
#if defined __GNUC__ && 4 < __GNUC__ + (3 <= __GNUC_MINOR__)
|
||||||
|
# pragma GCC diagnostic ignored "-Wtype-limits"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Return a value with the common real type of E and V and the value of V.
|
||||||
|
Do not evaluate E. */
|
||||||
|
#define _GL_INT_CONVERT(e, v) ((1 ? 0 : (e)) + (v))
|
||||||
|
|
||||||
|
/* Act like _GL_INT_CONVERT (E, -V) but work around a bug in IRIX 6.5 cc; see
|
||||||
|
<https://lists.gnu.org/r/bug-gnulib/2011-05/msg00406.html>. */
|
||||||
|
#define _GL_INT_NEGATE_CONVERT(e, v) ((1 ? 0 : (e)) - (v))
|
||||||
|
|
||||||
|
/* The extra casts in the following macros work around compiler bugs,
|
||||||
|
e.g., in Cray C 5.0.3.0. */
|
||||||
|
|
||||||
|
/* True if the real type T is signed. */
|
||||||
|
#define _GL_TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
|
||||||
|
|
||||||
|
/* Return 1 if the real expression E, after promotion, has a
|
||||||
|
signed or floating type. Do not evaluate E. */
|
||||||
|
#define _GL_EXPR_SIGNED(e) (_GL_INT_NEGATE_CONVERT (e, 1) < 0)
|
||||||
|
|
||||||
|
|
||||||
|
/* Minimum and maximum values for integer types and expressions. */
|
||||||
|
|
||||||
|
/* The width in bits of the integer type or expression T.
|
||||||
|
Do not evaluate T. T must not be a bit-field expression.
|
||||||
|
Padding bits are not supported; this is checked at compile-time below. */
|
||||||
|
#define _GL_TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
|
||||||
|
|
||||||
|
/* The maximum and minimum values for the type of the expression E,
|
||||||
|
after integer promotion. E is not evaluated. */
|
||||||
|
#define _GL_INT_MINIMUM(e) \
|
||||||
|
(_GL_EXPR_SIGNED (e) \
|
||||||
|
? ~ _GL_SIGNED_INT_MAXIMUM (e) \
|
||||||
|
: _GL_INT_CONVERT (e, 0))
|
||||||
|
#define _GL_INT_MAXIMUM(e) \
|
||||||
|
(_GL_EXPR_SIGNED (e) \
|
||||||
|
? _GL_SIGNED_INT_MAXIMUM (e) \
|
||||||
|
: _GL_INT_NEGATE_CONVERT (e, 1))
|
||||||
|
#define _GL_SIGNED_INT_MAXIMUM(e) \
|
||||||
|
(((_GL_INT_CONVERT (e, 1) << (_GL_TYPE_WIDTH (+ (e)) - 2)) - 1) * 2 + 1)
|
||||||
|
|
||||||
|
/* Work around OpenVMS incompatibility with C99. */
|
||||||
|
#if !defined LLONG_MAX && defined __INT64_MAX
|
||||||
|
# define LLONG_MAX __INT64_MAX
|
||||||
|
# define LLONG_MIN __INT64_MIN
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* This include file assumes that signed types are two's complement without
|
||||||
|
padding bits; the above macros have undefined behavior otherwise.
|
||||||
|
If this is a problem for you, please let us know how to fix it for your host.
|
||||||
|
This assumption is tested by the intprops-tests module. */
|
||||||
|
|
||||||
|
/* Does the __typeof__ keyword work? This could be done by
|
||||||
|
'configure', but for now it's easier to do it by hand. */
|
||||||
|
#if (2 <= __GNUC__ \
|
||||||
|
|| (4 <= __clang_major__) \
|
||||||
|
|| (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
|
||||||
|
|| (0x5110 <= __SUNPRO_C && !__STDC__))
|
||||||
|
# define _GL_HAVE___TYPEOF__ 1
|
||||||
|
#else
|
||||||
|
# define _GL_HAVE___TYPEOF__ 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Return 1 if the integer type or expression T might be signed. Return 0
|
||||||
|
if it is definitely unsigned. T must not be a bit-field expression.
|
||||||
|
This macro does not evaluate its argument, and expands to an
|
||||||
|
integer constant expression. */
|
||||||
|
#if _GL_HAVE___TYPEOF__
|
||||||
|
# define _GL_SIGNED_TYPE_OR_EXPR(t) _GL_TYPE_SIGNED (__typeof__ (t))
|
||||||
|
#else
|
||||||
|
# define _GL_SIGNED_TYPE_OR_EXPR(t) 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Return 1 if - A would overflow in [MIN,MAX] arithmetic.
|
||||||
|
A should not have side effects, and A's type should be an
|
||||||
|
integer with minimum value MIN and maximum MAX. */
|
||||||
|
#define _GL_INT_NEGATE_RANGE_OVERFLOW(a, min, max) \
|
||||||
|
((min) < 0 ? (a) < - (max) : 0 < (a))
|
||||||
|
|
||||||
|
/* True if __builtin_add_overflow (A, B, P) and __builtin_sub_overflow
|
||||||
|
(A, B, P) work when P is non-null. */
|
||||||
|
#ifdef __EDG__
|
||||||
|
/* EDG-based compilers like nvc 22.1 cannot add 64-bit signed to unsigned
|
||||||
|
<https://bugs.gnu.org/53256>. */
|
||||||
|
# define _GL_HAS_BUILTIN_ADD_OVERFLOW 0
|
||||||
|
#elif defined __has_builtin
|
||||||
|
# define _GL_HAS_BUILTIN_ADD_OVERFLOW __has_builtin (__builtin_add_overflow)
|
||||||
|
/* __builtin_{add,sub}_overflow exists but is not reliable in GCC 5.x and 6.x,
|
||||||
|
see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98269>. */
|
||||||
|
#elif 7 <= __GNUC__
|
||||||
|
# define _GL_HAS_BUILTIN_ADD_OVERFLOW 1
|
||||||
|
#else
|
||||||
|
# define _GL_HAS_BUILTIN_ADD_OVERFLOW 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* True if __builtin_mul_overflow (A, B, P) works when P is non-null. */
|
||||||
|
#if defined __clang_major__ && __clang_major__ < 14
|
||||||
|
/* Work around Clang bug <https://bugs.llvm.org/show_bug.cgi?id=16404>. */
|
||||||
|
# define _GL_HAS_BUILTIN_MUL_OVERFLOW 0
|
||||||
|
#else
|
||||||
|
# define _GL_HAS_BUILTIN_MUL_OVERFLOW _GL_HAS_BUILTIN_ADD_OVERFLOW
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* True if __builtin_add_overflow_p (A, B, C) works, and similarly for
|
||||||
|
__builtin_sub_overflow_p and __builtin_mul_overflow_p. */
|
||||||
|
#ifdef __EDG__
|
||||||
|
/* In EDG-based compilers like ICC 2021.3 and earlier,
|
||||||
|
__builtin_add_overflow_p etc. are not treated as integral constant
|
||||||
|
expressions even when all arguments are. */
|
||||||
|
# define _GL_HAS_BUILTIN_OVERFLOW_P 0
|
||||||
|
#elif defined __has_builtin
|
||||||
|
# define _GL_HAS_BUILTIN_OVERFLOW_P __has_builtin (__builtin_mul_overflow_p)
|
||||||
|
#else
|
||||||
|
# define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if (!defined _GL_STDCKDINT_H && 202311 <= __STDC_VERSION__ \
|
||||||
|
&& ! (_GL_HAS_BUILTIN_ADD_OVERFLOW && _GL_HAS_BUILTIN_MUL_OVERFLOW))
|
||||||
|
# include <stdckdint.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Store the low-order bits of A + B, A - B, A * B, respectively, into *R.
|
||||||
|
Return 1 if the result overflows. Arguments should not have side
|
||||||
|
effects and A, B and *R can be of any integer type other than char,
|
||||||
|
bool, a bit-precise integer type, or an enumeration type. */
|
||||||
|
#if _GL_HAS_BUILTIN_ADD_OVERFLOW
|
||||||
|
# define _GL_INT_ADD_WRAPV(a, b, r) __builtin_add_overflow (a, b, r)
|
||||||
|
# define _GL_INT_SUBTRACT_WRAPV(a, b, r) __builtin_sub_overflow (a, b, r)
|
||||||
|
#elif defined ckd_add && defined ckd_sub && !defined _GL_STDCKDINT_H
|
||||||
|
# define _GL_INT_ADD_WRAPV(a, b, r) ckd_add (r, + (a), + (b))
|
||||||
|
# define _GL_INT_SUBTRACT_WRAPV(a, b, r) ckd_sub (r, + (a), + (b))
|
||||||
|
#else
|
||||||
|
# define _GL_INT_ADD_WRAPV(a, b, r) \
|
||||||
|
_GL_INT_OP_WRAPV (a, b, r, +, _GL_INT_ADD_RANGE_OVERFLOW)
|
||||||
|
# define _GL_INT_SUBTRACT_WRAPV(a, b, r) \
|
||||||
|
_GL_INT_OP_WRAPV (a, b, r, -, _GL_INT_SUBTRACT_RANGE_OVERFLOW)
|
||||||
|
#endif
|
||||||
|
#if _GL_HAS_BUILTIN_MUL_OVERFLOW
|
||||||
|
# if ((9 < __GNUC__ + (3 <= __GNUC_MINOR__) \
|
||||||
|
|| (__GNUC__ == 8 && 4 <= __GNUC_MINOR__)) \
|
||||||
|
&& !defined __EDG__)
|
||||||
|
# define _GL_INT_MULTIPLY_WRAPV(a, b, r) __builtin_mul_overflow (a, b, r)
|
||||||
|
# else
|
||||||
|
/* Work around GCC bug 91450. */
|
||||||
|
# define _GL_INT_MULTIPLY_WRAPV(a, b, r) \
|
||||||
|
((!_GL_SIGNED_TYPE_OR_EXPR (*(r)) && _GL_EXPR_SIGNED (a) && _GL_EXPR_SIGNED (b) \
|
||||||
|
&& _GL_INT_MULTIPLY_RANGE_OVERFLOW (a, b, \
|
||||||
|
(__typeof__ (*(r))) 0, \
|
||||||
|
(__typeof__ (*(r))) -1)) \
|
||||||
|
? ((void) __builtin_mul_overflow (a, b, r), 1) \
|
||||||
|
: __builtin_mul_overflow (a, b, r))
|
||||||
|
# endif
|
||||||
|
#elif defined ckd_mul && !defined _GL_STDCKDINT_H
|
||||||
|
# define _GL_INT_MULTIPLY_WRAPV(a, b, r) ckd_mul (r, + (a), + (b))
|
||||||
|
#else
|
||||||
|
# define _GL_INT_MULTIPLY_WRAPV(a, b, r) \
|
||||||
|
_GL_INT_OP_WRAPV (a, b, r, *, _GL_INT_MULTIPLY_RANGE_OVERFLOW)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390. See:
|
||||||
|
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
|
||||||
|
https://llvm.org/bugs/show_bug.cgi?id=25390
|
||||||
|
For now, assume GCC < 14 and all Clang versions generate bogus
|
||||||
|
warnings for _Generic. This matters only for compilers that
|
||||||
|
lack relevant builtins. */
|
||||||
|
#if (__GNUC__ && __GNUC__ < 14) || defined __clang__
|
||||||
|
# define _GL__GENERIC_BOGUS 1
|
||||||
|
#else
|
||||||
|
# define _GL__GENERIC_BOGUS 0
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Store the low-order bits of A <op> B into *R, where OP specifies
|
||||||
|
the operation and OVERFLOW the overflow predicate. Return 1 if the
|
||||||
|
result overflows. Arguments should not have side effects,
|
||||||
|
and A, B and *R can be of any integer type other than char, bool, a
|
||||||
|
bit-precise integer type, or an enumeration type. */
|
||||||
|
#if 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
|
||||||
|
# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \
|
||||||
|
(_Generic \
|
||||||
|
(*(r), \
|
||||||
|
signed char: \
|
||||||
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
||||||
|
signed char, SCHAR_MIN, SCHAR_MAX), \
|
||||||
|
unsigned char: \
|
||||||
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
||||||
|
unsigned char, 0, UCHAR_MAX), \
|
||||||
|
short int: \
|
||||||
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
||||||
|
short int, SHRT_MIN, SHRT_MAX), \
|
||||||
|
unsigned short int: \
|
||||||
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
||||||
|
unsigned short int, 0, USHRT_MAX), \
|
||||||
|
int: \
|
||||||
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
||||||
|
int, INT_MIN, INT_MAX), \
|
||||||
|
unsigned int: \
|
||||||
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
||||||
|
unsigned int, 0, UINT_MAX), \
|
||||||
|
long int: \
|
||||||
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
||||||
|
long int, LONG_MIN, LONG_MAX), \
|
||||||
|
unsigned long int: \
|
||||||
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
||||||
|
unsigned long int, 0, ULONG_MAX), \
|
||||||
|
long long int: \
|
||||||
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
|
||||||
|
long long int, LLONG_MIN, LLONG_MAX), \
|
||||||
|
unsigned long long int: \
|
||||||
|
_GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
|
||||||
|
unsigned long long int, 0, ULLONG_MAX)))
|
||||||
|
#else
|
||||||
|
/* Store the low-order bits of A <op> B into *R, where OP specifies
|
||||||
|
the operation and OVERFLOW the overflow predicate. If *R is
|
||||||
|
signed, its type is ST with bounds SMIN..SMAX; otherwise its type
|
||||||
|
is UT with bounds U..UMAX. ST and UT are narrower than int.
|
||||||
|
Return 1 if the result overflows. Arguments should not have side
|
||||||
|
effects, and A, B and *R can be of any integer type other than
|
||||||
|
char, bool, a bit-precise integer type, or an enumeration type. */
|
||||||
|
# if _GL_HAVE___TYPEOF__
|
||||||
|
# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \
|
||||||
|
(_GL_TYPE_SIGNED (__typeof__ (*(r))) \
|
||||||
|
? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, st, smin, smax) \
|
||||||
|
: _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, ut, 0, umax))
|
||||||
|
# else
|
||||||
|
# define _GL_INT_OP_WRAPV_SMALLISH(a,b,r,op,overflow,st,smin,smax,ut,umax) \
|
||||||
|
(overflow (a, b, smin, smax) \
|
||||||
|
? (overflow (a, b, 0, umax) \
|
||||||
|
? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 1) \
|
||||||
|
: (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) < 0) \
|
||||||
|
: (overflow (a, b, 0, umax) \
|
||||||
|
? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st)) >= 0 \
|
||||||
|
: (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a,b,op,unsigned,st), 0)))
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# define _GL_INT_OP_WRAPV(a, b, r, op, overflow) \
|
||||||
|
(sizeof *(r) == sizeof (signed char) \
|
||||||
|
? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \
|
||||||
|
signed char, SCHAR_MIN, SCHAR_MAX, \
|
||||||
|
unsigned char, UCHAR_MAX) \
|
||||||
|
: sizeof *(r) == sizeof (short int) \
|
||||||
|
? _GL_INT_OP_WRAPV_SMALLISH (a, b, r, op, overflow, \
|
||||||
|
short int, SHRT_MIN, SHRT_MAX, \
|
||||||
|
unsigned short int, USHRT_MAX) \
|
||||||
|
: sizeof *(r) == sizeof (int) \
|
||||||
|
? (_GL_EXPR_SIGNED (*(r)) \
|
||||||
|
? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
||||||
|
int, INT_MIN, INT_MAX) \
|
||||||
|
: _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned int, \
|
||||||
|
unsigned int, 0, UINT_MAX)) \
|
||||||
|
: _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow))
|
||||||
|
# ifdef LLONG_MAX
|
||||||
|
# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
|
||||||
|
(sizeof *(r) == sizeof (long int) \
|
||||||
|
? (_GL_EXPR_SIGNED (*(r)) \
|
||||||
|
? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
||||||
|
long int, LONG_MIN, LONG_MAX) \
|
||||||
|
: _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
||||||
|
unsigned long int, 0, ULONG_MAX)) \
|
||||||
|
: (_GL_EXPR_SIGNED (*(r)) \
|
||||||
|
? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
|
||||||
|
long long int, LLONG_MIN, LLONG_MAX) \
|
||||||
|
: _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long long int, \
|
||||||
|
unsigned long long int, 0, ULLONG_MAX)))
|
||||||
|
# else
|
||||||
|
# define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
|
||||||
|
(_GL_EXPR_SIGNED (*(r)) \
|
||||||
|
? _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
||||||
|
long int, LONG_MIN, LONG_MAX) \
|
||||||
|
: _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
|
||||||
|
unsigned long int, 0, ULONG_MAX))
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Store the low-order bits of A <op> B into *R, where the operation
|
||||||
|
is given by OP. Use the unsigned type UT for calculation to avoid
|
||||||
|
overflow problems. *R's type is T, with extrema TMIN and TMAX.
|
||||||
|
T can be any signed integer type other than char, bool, a
|
||||||
|
bit-precise integer type, or an enumeration type.
|
||||||
|
Return 1 if the result overflows. */
|
||||||
|
#define _GL_INT_OP_CALC(a, b, r, op, overflow, ut, t, tmin, tmax) \
|
||||||
|
(overflow (a, b, tmin, tmax) \
|
||||||
|
? (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 1) \
|
||||||
|
: (*(r) = _GL_INT_OP_WRAPV_VIA_UNSIGNED (a, b, op, ut, t), 0))
|
||||||
|
|
||||||
|
/* Return 1 if the integer expressions A - B and -A would overflow,
|
||||||
|
respectively. Arguments should not have side effects,
|
||||||
|
and can be any signed integer type other than char, bool, a
|
||||||
|
bit-precise integer type, or an enumeration type.
|
||||||
|
These macros are tuned for their last input argument being a constant. */
|
||||||
|
|
||||||
|
#if _GL_HAS_BUILTIN_OVERFLOW_P
|
||||||
|
# define _GL_INT_NEGATE_OVERFLOW(a) \
|
||||||
|
__builtin_sub_overflow_p (0, a, (__typeof__ (- (a))) 0)
|
||||||
|
#else
|
||||||
|
# define _GL_INT_NEGATE_OVERFLOW(a) \
|
||||||
|
_GL_INT_NEGATE_RANGE_OVERFLOW (a, _GL_INT_MINIMUM (a), _GL_INT_MAXIMUM (a))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Return the low-order bits of A <op> B, where the operation is given
|
||||||
|
by OP. Use the unsigned type UT for calculation to avoid undefined
|
||||||
|
behavior on signed integer overflow, and convert the result to type T.
|
||||||
|
UT is at least as wide as T and is no narrower than unsigned int,
|
||||||
|
T is two's complement, and there is no padding or trap representations.
|
||||||
|
Assume that converting UT to T yields the low-order bits, as is
|
||||||
|
done in all known two's-complement C compilers. E.g., see:
|
||||||
|
https://gcc.gnu.org/onlinedocs/gcc/Integers-implementation.html
|
||||||
|
|
||||||
|
According to the C standard, converting UT to T yields an
|
||||||
|
implementation-defined result or signal for values outside T's
|
||||||
|
range. However, code that works around this theoretical problem
|
||||||
|
runs afoul of a compiler bug in Oracle Studio 12.3 x86. See:
|
||||||
|
https://lists.gnu.org/r/bug-gnulib/2017-04/msg00049.html
|
||||||
|
As the compiler bug is real, don't try to work around the
|
||||||
|
theoretical problem. */
|
||||||
|
|
||||||
|
#define _GL_INT_OP_WRAPV_VIA_UNSIGNED(a, b, op, ut, t) \
|
||||||
|
((t) ((ut) (a) op (ut) (b)))
|
||||||
|
|
||||||
|
/* Return true if the numeric values A + B, A - B, A * B fall outside
|
||||||
|
the range TMIN..TMAX. Arguments should not have side effects
|
||||||
|
and can be any integer type other than char, bool,
|
||||||
|
a bit-precise integer type, or an enumeration type.
|
||||||
|
TMIN should be signed and nonpositive.
|
||||||
|
TMAX should be positive, and should be signed unless TMIN is zero. */
|
||||||
|
#define _GL_INT_ADD_RANGE_OVERFLOW(a, b, tmin, tmax) \
|
||||||
|
((b) < 0 \
|
||||||
|
? (((tmin) \
|
||||||
|
? ((_GL_EXPR_SIGNED (_GL_INT_CONVERT (a, (tmin) - (b))) || (b) < (tmin)) \
|
||||||
|
&& (a) < (tmin) - (b)) \
|
||||||
|
: (a) <= -1 - (b)) \
|
||||||
|
|| ((_GL_EXPR_SIGNED (a) ? 0 <= (a) : (tmax) < (a)) && (tmax) < (a) + (b))) \
|
||||||
|
: (a) < 0 \
|
||||||
|
? (((tmin) \
|
||||||
|
? ((_GL_EXPR_SIGNED (_GL_INT_CONVERT (b, (tmin) - (a))) || (a) < (tmin)) \
|
||||||
|
&& (b) < (tmin) - (a)) \
|
||||||
|
: (b) <= -1 - (a)) \
|
||||||
|
|| ((_GL_EXPR_SIGNED (_GL_INT_CONVERT (a, b)) || (tmax) < (b)) \
|
||||||
|
&& (tmax) < (a) + (b))) \
|
||||||
|
: (tmax) < (b) || (tmax) - (b) < (a))
|
||||||
|
#define _GL_INT_SUBTRACT_RANGE_OVERFLOW(a, b, tmin, tmax) \
|
||||||
|
(((a) < 0) == ((b) < 0) \
|
||||||
|
? ((a) < (b) \
|
||||||
|
? !(tmin) || -1 - (tmin) < (b) - (a) - 1 \
|
||||||
|
: (tmax) < (a) - (b)) \
|
||||||
|
: (a) < 0 \
|
||||||
|
? ((!_GL_EXPR_SIGNED (_GL_INT_CONVERT ((a) - (tmin), b)) && (a) - (tmin) < 0) \
|
||||||
|
|| (a) - (tmin) < (b)) \
|
||||||
|
: ((! (_GL_EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \
|
||||||
|
&& _GL_EXPR_SIGNED (_GL_INT_CONVERT ((tmax) + (b), a))) \
|
||||||
|
&& (tmax) <= -1 - (b)) \
|
||||||
|
|| (tmax) + (b) < (a)))
|
||||||
|
#define _GL_INT_MULTIPLY_RANGE_OVERFLOW(a, b, tmin, tmax) \
|
||||||
|
((b) < 0 \
|
||||||
|
? ((a) < 0 \
|
||||||
|
? (_GL_EXPR_SIGNED (_GL_INT_CONVERT (tmax, b)) \
|
||||||
|
? (a) < (tmax) / (b) \
|
||||||
|
: ((_GL_INT_NEGATE_OVERFLOW (b) \
|
||||||
|
? _GL_INT_CONVERT (b, tmax) >> (_GL_TYPE_WIDTH (+ (b)) - 1) \
|
||||||
|
: (tmax) / -(b)) \
|
||||||
|
<= -1 - (a))) \
|
||||||
|
: _GL_INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (b, tmin)) && (b) == -1 \
|
||||||
|
? (_GL_EXPR_SIGNED (a) \
|
||||||
|
? 0 < (a) + (tmin) \
|
||||||
|
: 0 < (a) && -1 - (tmin) < (a) - 1) \
|
||||||
|
: (tmin) / (b) < (a)) \
|
||||||
|
: (b) == 0 \
|
||||||
|
? 0 \
|
||||||
|
: ((a) < 0 \
|
||||||
|
? (_GL_INT_NEGATE_OVERFLOW (_GL_INT_CONVERT (a, tmin)) && (a) == -1 \
|
||||||
|
? (_GL_EXPR_SIGNED (b) ? 0 < (b) + (tmin) : -1 - (tmin) < (b) - 1) \
|
||||||
|
: (tmin) / (a) < (b)) \
|
||||||
|
: (tmax) / (b) < (a)))
|
||||||
|
|
||||||
|
#endif /* _GL_INTPROPS_INTERNAL_H */
|
|
@ -0,0 +1,35 @@
|
||||||
|
/* stdckdint.h -- checked integer arithmetic
|
||||||
|
|
||||||
|
Copyright 2022-2024 Free Software Foundation, Inc.
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify it
|
||||||
|
under the terms of the GNU Lesser General Public License as published
|
||||||
|
by the Free Software Foundation; either version 2.1 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>. */
|
||||||
|
|
||||||
|
#ifndef _GL_STDCKDINT_H
|
||||||
|
#define _GL_STDCKDINT_H
|
||||||
|
|
||||||
|
#include "intprops-internal.h"
|
||||||
|
|
||||||
|
/* Store into *R the low-order bits of A + B, A - B, A * B, respectively.
|
||||||
|
Return 1 if the result overflows, 0 otherwise.
|
||||||
|
A, B, and *R can have any integer type other than char, bool, a
|
||||||
|
bit-precise integer type, or an enumeration type.
|
||||||
|
|
||||||
|
These are like the standard macros introduced in C23, except that
|
||||||
|
arguments should not have side effects. */
|
||||||
|
|
||||||
|
#define ckd_add(r, a, b) ((bool) _GL_INT_ADD_WRAPV (a, b, r))
|
||||||
|
#define ckd_sub(r, a, b) ((bool) _GL_INT_SUBTRACT_WRAPV (a, b, r))
|
||||||
|
#define ckd_mul(r, a, b) ((bool) _GL_INT_MULTIPLY_WRAPV (a, b, r))
|
||||||
|
|
||||||
|
#endif /* _GL_STDCKDINT_H */
|
|
@ -0,0 +1,57 @@
|
||||||
|
# gnulib-common.m4
|
||||||
|
# serial 101
|
||||||
|
dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
|
||||||
|
dnl This file is free software; the Free Software Foundation
|
||||||
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
|
AC_PREREQ([2.62])
|
||||||
|
|
||||||
|
|
||||||
|
# gl_CONDITIONAL(conditional, condition)
|
||||||
|
# is like AM_CONDITIONAL(conditional, condition), except that it does not
|
||||||
|
# produce an error
|
||||||
|
# configure: error: conditional "..." was never defined.
|
||||||
|
# Usually this means the macro was only invoked conditionally.
|
||||||
|
# when only invoked conditionally. Instead, in that case, both the _TRUE
|
||||||
|
# and the _FALSE case are disabled.
|
||||||
|
AC_DEFUN([gl_CONDITIONAL],
|
||||||
|
[
|
||||||
|
pushdef([AC_CONFIG_COMMANDS_PRE], [:])dnl
|
||||||
|
AM_CONDITIONAL([$1], [$2])
|
||||||
|
popdef([AC_CONFIG_COMMANDS_PRE])dnl
|
||||||
|
if test -z "${[$1]_TRUE}" && test -z "${[$1]_FALSE}"; then
|
||||||
|
[$1]_TRUE='#'
|
||||||
|
[$1]_FALSE='#'
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl gl_CONDITIONAL_HEADER([foo.h])
|
||||||
|
dnl takes a shell variable GL_GENERATE_FOO_H (with value true or false) as input
|
||||||
|
dnl and produces
|
||||||
|
dnl - an AC_SUBSTed variable FOO_H that is either a file name or empty, based
|
||||||
|
dnl on whether GL_GENERATE_FOO_H is true or false,
|
||||||
|
dnl - an Automake conditional GL_GENERATE_FOO_H that evaluates to the value of
|
||||||
|
dnl the shell variable GL_GENERATE_FOO_H.
|
||||||
|
AC_DEFUN([gl_CONDITIONAL_HEADER],
|
||||||
|
[
|
||||||
|
m4_pushdef([gl_header_name], AS_TR_SH(m4_toupper($1)))
|
||||||
|
m4_pushdef([gl_generate_var], [GL_GENERATE_]AS_TR_SH(m4_toupper($1)))
|
||||||
|
m4_pushdef([gl_generate_cond], [GL_GENERATE_]AS_TR_SH(m4_toupper($1)))
|
||||||
|
case "$gl_generate_var" in
|
||||||
|
false) gl_header_name='' ;;
|
||||||
|
true)
|
||||||
|
dnl It is OK to use a .h file in lib/ from within tests/, but not vice
|
||||||
|
dnl versa.
|
||||||
|
if test -z "$gl_header_name"; then
|
||||||
|
gl_header_name="${gl_source_base_prefix}$1"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
*) echo "*** gl_generate_var is not set correctly" 1>&2; exit 1 ;;
|
||||||
|
esac
|
||||||
|
AC_SUBST(gl_header_name)
|
||||||
|
gl_CONDITIONAL(gl_generate_cond, [$gl_generate_var])
|
||||||
|
m4_popdef([gl_generate_cond])
|
||||||
|
m4_popdef([gl_generate_var])
|
||||||
|
m4_popdef([gl_header_name])
|
||||||
|
])
|
|
@ -0,0 +1,23 @@
|
||||||
|
dnl
|
||||||
|
dnl Check <stdckdint.h> that is like C23.
|
||||||
|
dnl
|
||||||
|
|
||||||
|
AC_DEFUN([mc_CHECK_HEADER_STDCKDINT],
|
||||||
|
[
|
||||||
|
AC_CHECK_HEADERS_ONCE([stdckdint.h])
|
||||||
|
if test $ac_cv_header_stdckdint_h = yes; then
|
||||||
|
GL_GENERATE_STDCKDINT_H=false
|
||||||
|
else
|
||||||
|
GL_GENERATE_STDCKDINT_H=true
|
||||||
|
fi
|
||||||
|
gl_CONDITIONAL_HEADER([stdckdint.h])
|
||||||
|
|
||||||
|
dnl We need the following in order to create <stdckdint.h> when the system
|
||||||
|
dnl doesn't have one that works with the given compiler.
|
||||||
|
if test "$GL_GENERATE_STDCKDINT_H" = "true"; then
|
||||||
|
sed -e 1h -e '1s,.*,/* DO NOT EDIT! GENERATED AUTOMATICALLY! */,' -e s,bool,gboolean, -e 1G \
|
||||||
|
$ac_abs_confdir/lib/stdckdint.in.h > $ac_abs_confdir/lib/stdckdint.h
|
||||||
|
else
|
||||||
|
rm -f "$ac_abs_confdir/lib/stdckdint.h"
|
||||||
|
fi
|
||||||
|
])
|
Loading…
Reference in New Issue