4a626d0a0f
2015-08-24 Pedro Alves <palves@redhat.com> * gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to 1029a8112290f6eee9d7878a391c49db42c999bd. * gnulib/configure, gnulib/config.in, gnulib/aclocal.m4: Regenerate. * gnulib/import/Makefile.am: Update. * gnulib/import/Makefile.in: Update. * gnulib/import/alloca.in.h: Update. * gnulib/import/basename-lgpl.c: Update. * gnulib/import/canonicalize-lgpl.c: Update. * gnulib/import/config.charset: Update. * gnulib/import/dirent.in.h: Update. * gnulib/import/dirfd.c: Update. * gnulib/import/dirname-lgpl.c: Update. * gnulib/import/dirname.h: Update. * gnulib/import/dosname.h: Update. * gnulib/import/errno.in.h: Update. * gnulib/import/extra/snippet/arg-nonnull.h: Update. * gnulib/import/extra/snippet/c++defs.h: Update. * gnulib/import/extra/snippet/warn-on-use.h: Update. * gnulib/import/extra/update-copyright: Update. * gnulib/import/float+.h: Update. * gnulib/import/float.c: Update. * gnulib/import/float.in.h: Update. * gnulib/import/fnmatch.c: Update. * gnulib/import/fnmatch.in.h: Update. * gnulib/import/fnmatch_loop.c: Update. * gnulib/import/fpucw.h: Update. * gnulib/import/frexp.c: Update. * gnulib/import/frexpl.c: Update. * gnulib/import/gettimeofday.c: Update. * gnulib/import/inttypes.in.h: Update. * gnulib/import/isnan.c: Update. * gnulib/import/isnand-nolibm.h: Update. * gnulib/import/isnand.c: Update. * gnulib/import/isnanl-nolibm.h: Update. * gnulib/import/isnanl.c: Update. * gnulib/import/itold.c: Update. * gnulib/import/localcharset.c: Update. * gnulib/import/localcharset.h: Update. * gnulib/import/lstat.c: Update. * gnulib/import/m4/00gnulib.m4: Update. * gnulib/import/m4/absolute-header.m4: Update. * gnulib/import/m4/alloca.m4: Update. * gnulib/import/m4/canonicalize.m4: Update. * gnulib/import/m4/codeset.m4: Update. * gnulib/import/m4/configmake.m4: Update. * gnulib/import/m4/dirent_h.m4: Update. * gnulib/import/m4/dirfd.m4: Update. * gnulib/import/m4/dirname.m4: Update. * gnulib/import/m4/double-slash-root.m4: Update. * gnulib/import/m4/eealloc.m4: Update. * gnulib/import/m4/errno_h.m4: Update. * gnulib/import/m4/exponentd.m4: Update. * gnulib/import/m4/exponentl.m4: Update. * gnulib/import/m4/extensions.m4: Update. * gnulib/import/m4/extern-inline.m4: Update. * gnulib/import/m4/fcntl-o.m4: Update. * gnulib/import/m4/float_h.m4: Update. * gnulib/import/m4/fnmatch.m4: Update. * gnulib/import/m4/fpieee.m4: Update. * gnulib/import/m4/frexp.m4: Update. * gnulib/import/m4/frexpl.m4: Update. * gnulib/import/m4/gettimeofday.m4: Update. * gnulib/import/m4/glibc21.m4: Update. * gnulib/import/m4/gnulib-cache.m4: Update. * gnulib/import/m4/gnulib-common.m4: Update. * gnulib/import/m4/gnulib-comp.m4: Update. * gnulib/import/m4/gnulib-tool.m4: Update. * gnulib/import/m4/include_next.m4: Update. * gnulib/import/m4/inttypes-pri.m4: Update. * gnulib/import/m4/inttypes.m4: Update. * gnulib/import/m4/isnand.m4: Update. * gnulib/import/m4/isnanl.m4: Update. * gnulib/import/m4/largefile.m4: Update. * gnulib/import/m4/localcharset.m4: Update. * gnulib/import/m4/locale-fr.m4: Update. * gnulib/import/m4/locale-ja.m4: Update. * gnulib/import/m4/locale-zh.m4: Update. * gnulib/import/m4/longlong.m4: Update. * gnulib/import/m4/lstat.m4: Update. * gnulib/import/m4/malloc.m4: Update. * gnulib/import/m4/malloca.m4: Update. * gnulib/import/m4/math_h.m4: Update. * gnulib/import/m4/mbrtowc.m4: Update. * gnulib/import/m4/mbsinit.m4: Update. * gnulib/import/m4/mbsrtowcs.m4: Update. * gnulib/import/m4/mbstate_t.m4: Update. * gnulib/import/m4/memchr.m4: Update. * gnulib/import/m4/memmem.m4: Update. * gnulib/import/m4/mmap-anon.m4: Update. * gnulib/import/m4/multiarch.m4: Update. * gnulib/import/m4/nocrash.m4: Update. * gnulib/import/m4/off_t.m4: Update. * gnulib/import/m4/pathmax.m4: Update. * gnulib/import/m4/readlink.m4: Update. * gnulib/import/m4/rename.m4: Update. * gnulib/import/m4/rmdir.m4: Update. * gnulib/import/m4/ssize_t.m4: Update. * gnulib/import/m4/stat.m4: Update. * gnulib/import/m4/stdbool.m4: Update. * gnulib/import/m4/stddef_h.m4: Update. * gnulib/import/m4/stdint.m4: Update. * gnulib/import/m4/stdio_h.m4: Update. * gnulib/import/m4/stdlib_h.m4: Update. * gnulib/import/m4/string_h.m4: Update. * gnulib/import/m4/strstr.m4: Update. * gnulib/import/m4/strtok_r.m4: Update. * gnulib/import/m4/sys_socket_h.m4: Update. * gnulib/import/m4/sys_stat_h.m4: Update. * gnulib/import/m4/sys_time_h.m4: Update. * gnulib/import/m4/sys_types_h.m4: Update. * gnulib/import/m4/time_h.m4: Update. * gnulib/import/m4/unistd_h.m4: Update. * gnulib/import/m4/warn-on-use.m4: Update. * gnulib/import/m4/wchar_h.m4: Update. * gnulib/import/m4/wchar_t.m4: Update. * gnulib/import/m4/wctype_h.m4: Update. * gnulib/import/m4/wint_t.m4: Update. * gnulib/import/malloc.c: Update. * gnulib/import/malloca.c: Update. * gnulib/import/malloca.h: Update. * gnulib/import/math.in.h: Update. * gnulib/import/mbrtowc.c: Update. * gnulib/import/mbsinit.c: Update. * gnulib/import/mbsrtowcs-impl.h: Update. * gnulib/import/mbsrtowcs-state.c: Update. * gnulib/import/mbsrtowcs.c: Update. * gnulib/import/memchr.c: Update. * gnulib/import/memmem.c: Update. * gnulib/import/pathmax.h: Update. * gnulib/import/readlink.c: Update. * gnulib/import/ref-add.sin: Update. * gnulib/import/ref-del.sin: Update. * gnulib/import/rename.c: Update. * gnulib/import/rmdir.c: Update. * gnulib/import/same-inode.h: Update. * gnulib/import/stat.c: Update. * gnulib/import/stdbool.in.h: Update. * gnulib/import/stddef.in.h: Update. * gnulib/import/stdint.in.h: Update. * gnulib/import/stdio.c: Update. * gnulib/import/stdio.in.h: Update. * gnulib/import/stdlib.in.h: Update. * gnulib/import/str-two-way.h: Update. * gnulib/import/streq.h: Update. * gnulib/import/string.in.h: Update. * gnulib/import/stripslash.c: Update. * gnulib/import/strnlen1.c: Update. * gnulib/import/strnlen1.h: Update. * gnulib/import/strstr.c: Update. * gnulib/import/strtok_r.c: Update. * gnulib/import/sys_stat.in.h: Update. * gnulib/import/sys_time.in.h: Update. * gnulib/import/sys_types.in.h: Update. * gnulib/import/time.in.h: Update. * gnulib/import/unistd.in.h: Update. * gnulib/import/verify.h: Update. * gnulib/import/wchar.in.h: Update. * gnulib/import/wctype.in.h: Update. * gnulib/import/gettimeofday.c: New file. * gnulib/import/m4/absolute-header.m4: New file. * gnulib/import/m4/gettimeofday.m4: New file. * gnulib/import/m4/sys_socket_h.m4: New file. * gnulib/import/m4/sys_time_h.m4: New file. * gnulib/import/stdio.c: Delete file. * gnulib/import/sys_time.in.h: New file.
133 lines
4.6 KiB
C++
133 lines
4.6 KiB
C++
/* Safe automatic memory allocation.
|
|
Copyright (C) 2003-2007, 2009-2015 Free Software Foundation, Inc.
|
|
Written by Bruno Haible <bruno@clisp.org>, 2003.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3, 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _MALLOCA_H
|
|
#define _MALLOCA_H
|
|
|
|
#include <alloca.h>
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
|
|
/* safe_alloca(N) is equivalent to alloca(N) when it is safe to call
|
|
alloca(N); otherwise it returns NULL. It either returns N bytes of
|
|
memory allocated on the stack, that lasts until the function returns,
|
|
or NULL.
|
|
Use of safe_alloca should be avoided:
|
|
- inside arguments of function calls - undefined behaviour,
|
|
- in inline functions - the allocation may actually last until the
|
|
calling function returns.
|
|
*/
|
|
#if HAVE_ALLOCA
|
|
/* The OS usually guarantees only one guard page at the bottom of the stack,
|
|
and a page size can be as small as 4096 bytes. So we cannot safely
|
|
allocate anything larger than 4096 bytes. Also care for the possibility
|
|
of a few compiler-allocated temporary stack slots.
|
|
This must be a macro, not a function. */
|
|
# define safe_alloca(N) ((N) < 4032 ? alloca (N) : NULL)
|
|
#else
|
|
# define safe_alloca(N) ((void) (N), NULL)
|
|
#endif
|
|
|
|
/* malloca(N) is a safe variant of alloca(N). It allocates N bytes of
|
|
memory allocated on the stack, that must be freed using freea() before
|
|
the function returns. Upon failure, it returns NULL. */
|
|
#if HAVE_ALLOCA
|
|
# define malloca(N) \
|
|
((N) < 4032 - sa_increment \
|
|
? (void *) ((char *) alloca ((N) + sa_increment) + sa_increment) \
|
|
: mmalloca (N))
|
|
#else
|
|
# define malloca(N) \
|
|
mmalloca (N)
|
|
#endif
|
|
extern void * mmalloca (size_t n);
|
|
|
|
/* Free a block of memory allocated through malloca(). */
|
|
#if HAVE_ALLOCA
|
|
extern void freea (void *p);
|
|
#else
|
|
# define freea free
|
|
#endif
|
|
|
|
/* nmalloca(N,S) is an overflow-safe variant of malloca (N * S).
|
|
It allocates an array of N objects, each with S bytes of memory,
|
|
on the stack. S must be positive and N must be nonnegative.
|
|
The array must be freed using freea() before the function returns. */
|
|
#if 1
|
|
/* Cf. the definition of xalloc_oversized. */
|
|
# define nmalloca(n, s) \
|
|
((n) > (size_t) (sizeof (ptrdiff_t) <= sizeof (size_t) ? -1 : -2) / (s) \
|
|
? NULL \
|
|
: malloca ((n) * (s)))
|
|
#else
|
|
extern void * nmalloca (size_t n, size_t s);
|
|
#endif
|
|
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
|
|
/* ------------------- Auxiliary, non-public definitions ------------------- */
|
|
|
|
/* Determine the alignment of a type at compile time. */
|
|
#if defined __GNUC__ || defined __IBM__ALIGNOF__
|
|
# define sa_alignof __alignof__
|
|
#elif defined __cplusplus
|
|
template <class type> struct sa_alignof_helper { char __slot1; type __slot2; };
|
|
# define sa_alignof(type) offsetof (sa_alignof_helper<type>, __slot2)
|
|
#elif defined __hpux
|
|
/* Work around a HP-UX 10.20 cc bug with enums constants defined as offsetof
|
|
values. */
|
|
# define sa_alignof(type) (sizeof (type) <= 4 ? 4 : 8)
|
|
#elif defined _AIX
|
|
/* Work around an AIX 3.2.5 xlc bug with enums constants defined as offsetof
|
|
values. */
|
|
# define sa_alignof(type) (sizeof (type) <= 4 ? 4 : 8)
|
|
#else
|
|
# define sa_alignof(type) offsetof (struct { char __slot1; type __slot2; }, __slot2)
|
|
#endif
|
|
|
|
enum
|
|
{
|
|
/* The desired alignment of memory allocations is the maximum alignment
|
|
among all elementary types. */
|
|
sa_alignment_long = sa_alignof (long),
|
|
sa_alignment_double = sa_alignof (double),
|
|
#if HAVE_LONG_LONG_INT
|
|
sa_alignment_longlong = sa_alignof (long long),
|
|
#endif
|
|
sa_alignment_longdouble = sa_alignof (long double),
|
|
sa_alignment_max = ((sa_alignment_long - 1) | (sa_alignment_double - 1)
|
|
#if HAVE_LONG_LONG_INT
|
|
| (sa_alignment_longlong - 1)
|
|
#endif
|
|
| (sa_alignment_longdouble - 1)
|
|
) + 1,
|
|
/* The increment that guarantees room for a magic word must be >= sizeof (int)
|
|
and a multiple of sa_alignment_max. */
|
|
sa_increment = ((sizeof (int) + sa_alignment_max - 1) / sa_alignment_max) * sa_alignment_max
|
|
};
|
|
|
|
#endif /* _MALLOCA_H */
|