Update to glibc 2.38

closes #6

.github/workflows/release.yml

@@ -0,0 +1,31 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Bootstrap
+      run: ./bootstrap.sh
+
+    - name: Configure
+      run: ./configure
+
+    - name: Make dist
+      run: make dist
+
+    - name: Upload dist to Release
+      uses: svenstaro/upload-release-action@v2
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: obstack-*.tar.gz
+        tag: ${{ github.ref }}
+        file_glob: true

.gitignore

@@ -10,8 +10,14 @@ config.log
 config.status
 config.sub
 configure
+config.h
+config.h.in
+config.h.in~
 depcomp
+libtool
 ltmain.sh
 install-sh
 missing
+musl-obstack.pc
+stamp-h1
 m4/

Makefile.am

@@ -1,6 +1,9 @@
 ## Makefile.am - procress this file with automake to produce Makefile.in
 lib_LTLIBRARIES = libobstack.la
-libobstack_la_SOURCES = obstack.c
+libobstack_la_SOURCES = obstack.c obstack_printf.c
 libobstack_la_HEADERS = obstack.h
+libobstack_la_LDFLAGS = -version-info 1
 libobstack_ladir = $(includedir)
 ACLOCAL_AMFLAGS = -Im4
+
+pkgconfig_DATA = musl-obstack.pc

bootstrap.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 libtoolize
 aclocal
+autoheader
 autoconf
 automake --add-missing

configure.ac

@@ -1,16 +1,19 @@
 dnl Process this file with autoconf to produce a configure script
 
-AC_PREREQ(2.69)
+AC_PREREQ([2.71])
 
-AC_INIT([obstack], [1.0], [pullmoll@t-online.de])
+AC_INIT([obstack],[1.3],[pullmoll@t-online.de])
 
-AM_INIT_AUTOMAKE([1.15])
+AM_INIT_AUTOMAKE([1.16])
 AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_HEADERS([config.h])
 
 AC_PROG_CC
 AC_PROG_LIBTOOL
 
 AC_CHECK_HEADERS(stddef.h stdio.h stdint.h inttypes.h)
 
+PKG_INSTALLDIR
+
 AC_CONFIG_FILES([Makefile musl-obstack.pc])
 AC_OUTPUT

musl-obstack.pc.in

@@ -1,7 +1,7 @@
-prefix=/usr
+prefix=@prefix@
-exec_prefix=${prefix}
+exec_prefix=@exec_prefix@
-libdir=${prefix}/lib
+libdir=@libdir@
-includedir=${prefix}/include
+includedir=@includedir@
 
 Name: musl-obstack
 Description: Implementation of obstack functions for musl libc

obstack.c

@@ -1,31 +1,30 @@
 /* obstack.c - subroutines used implicitly by object stack macros
-   Copyright (C) 1988,89,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+   Copyright (C) 1988-2023 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.
 
-   NOTE: This source is derived from an old version taken from the GNU C
+   The GNU C Library is distributed in the hope that it will be useful,
-   Library (glibc).
-
-   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 2, 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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Lesser General Public
-   along with this program; if not, write to the Free Software
+   License along with the GNU C Library; if not, see
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
+   <https://www.gnu.org/licenses/>.  */
-   USA.  */
 
-#ifdef HAVE_CONFIG_H
+
-#include <config.h>
+#ifdef _LIBC
+# include <obstack.h>
+# include <shlib-compat.h>
+#else
+# include <config.h>
+# include "obstack.h"
 #endif
 
-#include "obstack.h"
-
 /* NOTE BEFORE MODIFYING THIS FILE: This version number must be
    incremented whenever callers compiled using an old obstack.h can no
    longer properly call the functions in this obstack.c.  */
@@ -37,62 +36,76 @@
    C Library, but also included in many other GNU distributions.  Compiling
    and linking in this code is a waste when using the GNU C library
    (especially if it is a shared library).  Rather than having every GNU
-   program understand `configure --with-gnu-libc' and omit the object
+   program understand 'configure --with-gnu-libc' and omit the object
    files, it is simpler to just do this in the source for each such file.  */
 
 #include <stdio.h>              /* Random thing to get __GNU_LIBRARY__.  */
-#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1
+#if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
-#include <gnu-versions.h>
+# include <gnu-versions.h>
-#if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
+# if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION
-#define ELIDE_CODE
+#  define ELIDE_CODE
-#endif
+# endif
 #endif
 
+#include <stddef.h>
 
 #ifndef ELIDE_CODE
 
 
-#define POINTER void *
+# include <stdint.h>
 
 /* Determine default alignment.  */
-struct fooalign {char x; double d;};
+union fooround
-#define DEFAULT_ALIGNMENT  \
+{
-  ((PTR_INT_TYPE) ((char *) &((struct fooalign *) 0)->d - (char *) 0))
+  uintmax_t i;
+  long double d;
+  void *p;
+};
+struct fooalign
+{
+  char c;
+  union fooround u;
+};
 /* If malloc were really smart, it would round addresses to DEFAULT_ALIGNMENT.
    But in fact it might be less smart and round addresses to as much as
    DEFAULT_ROUNDING.  So we prepare for it to do that.  */
-union fooround {long x; double d;};
+enum
-#define DEFAULT_ROUNDING (sizeof (union fooround))
+{
+  DEFAULT_ALIGNMENT = offsetof (struct fooalign, u),
+  DEFAULT_ROUNDING = sizeof (union fooround)
+};
 
 /* When we copy a long block of data, this is the unit to do it with.
    On some machines, copying successive ints does not work;
-   in such a case, redefine COPYING_UNIT to `long' (if that works)
+   in such a case, redefine COPYING_UNIT to 'long' (if that works)
-   or `char' as a last resort.  */
+   or 'char' as a last resort.  */
-#ifndef COPYING_UNIT
+# ifndef COPYING_UNIT
-#define COPYING_UNIT int
+#  define COPYING_UNIT int
-#endif
+# endif
 
 
-/* The functions allocating more room by calling `obstack_chunk_alloc'
+/* The functions allocating more room by calling 'obstack_chunk_alloc'
-   jump to the handler pointed to by `obstack_alloc_failed_handler'.
+   jump to the handler pointed to by 'obstack_alloc_failed_handler'.
-   This variable by default points to the internal function
+   This can be set to a user defined function which should either
-   `print_and_abort'.  */
+   abort gracefully or use longjump - but shouldn't return.  This
-static void print_and_abort (void);
+   variable by default points to the internal function
+   'print_and_abort'.  */
+static _Noreturn void print_and_abort (void);
 void (*obstack_alloc_failed_handler) (void) = print_and_abort;
 
-/* Exit value used when `print_and_abort' is used.  */
+/* Exit value used when 'print_and_abort' is used.  */
-#if defined __GNU_LIBRARY__ || defined HAVE_STDLIB_H
+# include <stdlib.h>
-#include <stdlib.h>
-#endif
-#ifndef EXIT_FAILURE
-#define EXIT_FAILURE 1
-#endif
 int obstack_exit_failure = EXIT_FAILURE;
 
-/* The non-GNU-C macros copy the obstack into this global variable
+# ifdef _LIBC
-   to avoid multiple evaluation.  */
+#  if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
-
+/* A looong time ago (before 1994, anyway; we're not sure) this global variable
-struct obstack *_obstack;
+   was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
+   library still exports it because somebody might use it.  */
+struct obstack *_obstack_compat = 0;
+compat_symbol (libc, _obstack_compat, _obstack, GLIBC_2_0);
+#  endif
+# endif
 
 /* Define a macro that either calls functions with the traditional malloc/free
    calling interface, or calls functions with the mmalloc/mfree interface
@@ -100,52 +113,38 @@ struct obstack *_obstack;
    For free, do not use ?:, since some compilers, like the MIPS compilers,
    do not allow (expr) ? void : void.  */
 
-#if defined (__STDC__) && __STDC__
+# define CALL_CHUNKFUN(h, size) \
-#define CALL_CHUNKFUN(h, size) \
+  (((h)->use_extra_arg)							      \
-  (((h) -> use_extra_arg) \
+   ? (*(h)->chunkfun)((h)->extra_arg, (size))				      \
-   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
+   : (*(struct _obstack_chunk *(*)(long))(h)->chunkfun)((size)))
-   : (*(struct _obstack_chunk *(*) (long)) (h)->chunkfun) ((size)))
 
-#define CALL_FREEFUN(h, old_chunk) \
+# define CALL_FREEFUN(h, old_chunk) \
   do { \
-    if ((h) -> use_extra_arg) \
+      if ((h)->use_extra_arg)						      \
-      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
+	(*(h)->freefun)((h)->extra_arg, (old_chunk));			      \
       else								      \
-      (*(void (*) (void *)) (h)->freefun) ((old_chunk)); \
+	(*(void (*)(void *))(h)->freefun)((old_chunk));			      \
     } while (0)
-#else
-#define CALL_CHUNKFUN(h, size) \
-  (((h) -> use_extra_arg) \
-   ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \
-   : (*(struct _obstack_chunk *(*) ()) (h)->chunkfun) ((size)))
 
-#define CALL_FREEFUN(h, old_chunk) \
-  do { \
-    if ((h) -> use_extra_arg) \
-      (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \
-    else \
-      (*(void (*) ()) (h)->freefun) ((old_chunk)); \
-  } while (0)
-#endif
 
-
 /* Initialize an obstack H for use.  Specify chunk size SIZE (0 means default).
    Objects start on multiples of ALIGNMENT (0 means use default).
    CHUNKFUN is the function to use to allocate chunks,
    and FREEFUN the function to free them.
 
-   Return nonzero if successful, zero if out of memory.
+   Return nonzero if successful, calls obstack_alloc_failed_handler if
-   To recover from an out of memory error,
+   allocation fails.  */
-   free up some memory, then call this again.  */
 
 int
-_obstack_begin (struct obstack *h, int size, int alignment,
+_obstack_begin (struct obstack *h,
-                POINTER (*chunkfun) (long), void (*freefun) (void *))
+		int size, int alignment,
+		void *(*chunkfun) (long),
+		void (*freefun) (void *))
 {
-  register struct _obstack_chunk *chunk; /* points to new chunk */
+  struct _obstack_chunk *chunk; /* points to new chunk */
 
   if (alignment == 0)
-    alignment = (int) DEFAULT_ALIGNMENT;
+    alignment = DEFAULT_ALIGNMENT;
   if (size == 0)
     /* Default size is what GNU malloc can fit in a 4096-byte block.  */
     {
@@ -163,16 +162,17 @@ _obstack_begin (struct obstack *h, int size, int alignment,
       size = 4096 - extra;
     }
 
-  h->chunkfun = (struct _obstack_chunk * (*)(void *, long)) chunkfun;
+  h->chunkfun = (struct _obstack_chunk * (*) (void *, long)) chunkfun;
   h->freefun = (void (*) (void *, struct _obstack_chunk *)) freefun;
   h->chunk_size = size;
   h->alignment_mask = alignment - 1;
   h->use_extra_arg = 0;
 
-  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
+  chunk = h->chunk = CALL_CHUNKFUN (h, h->chunk_size);
   if (!chunk)
     (*obstack_alloc_failed_handler) ();
-  h->next_free = h->object_base = chunk->contents;
+  h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
+					       alignment - 1);
   h->chunk_limit = chunk->limit
     = (char *) chunk + h->chunk_size;
   chunk->prev = 0;
@@ -184,13 +184,14 @@ _obstack_begin (struct obstack *h, int size, int alignment,
 
 int
 _obstack_begin_1 (struct obstack *h, int size, int alignment,
-                  POINTER (*chunkfun) (POINTER, long),
+		  void *(*chunkfun) (void *, long),
-                  void (*freefun) (POINTER, POINTER), POINTER arg)
+		  void (*freefun) (void *, void *),
+		  void *arg)
 {
-  register struct _obstack_chunk *chunk; /* points to new chunk */
+  struct _obstack_chunk *chunk; /* points to new chunk */
 
   if (alignment == 0)
-    alignment = (int) DEFAULT_ALIGNMENT;
+    alignment = DEFAULT_ALIGNMENT;
   if (size == 0)
     /* Default size is what GNU malloc can fit in a 4096-byte block.  */
     {
@@ -215,10 +216,11 @@ _obstack_begin_1 (struct obstack *h, int size, int alignment,
   h->extra_arg = arg;
   h->use_extra_arg = 1;
 
-  chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size);
+  chunk = h->chunk = CALL_CHUNKFUN (h, h->chunk_size);
   if (!chunk)
     (*obstack_alloc_failed_handler) ();
-  h->next_free = h->object_base = chunk->contents;
+  h->next_free = h->object_base = __PTR_ALIGN ((char *) chunk, chunk->contents,
+					       alignment - 1);
   h->chunk_limit = chunk->limit
     = (char *) chunk + h->chunk_size;
   chunk->prev = 0;
@@ -237,26 +239,31 @@ _obstack_begin_1 (struct obstack *h, int size, int alignment,
 void
 _obstack_newchunk (struct obstack *h, int length)
 {
-  register struct _obstack_chunk *old_chunk = h->chunk;
+  struct _obstack_chunk *old_chunk = h->chunk;
-  register struct _obstack_chunk *new_chunk;
+  struct _obstack_chunk *new_chunk;
-  register long	new_size;
+  long new_size;
-  register long obj_size = h->next_free - h->object_base;
+  long obj_size = h->next_free - h->object_base;
-  register long i;
+  long i;
   long already;
+  char *object_base;
 
   /* Compute size for new chunk.  */
-  new_size = (obj_size + length) + (obj_size >> 3) + 100;
+  new_size = (obj_size + length) + (obj_size >> 3) + h->alignment_mask + 100;
   if (new_size < h->chunk_size)
     new_size = h->chunk_size;
 
   /* Allocate and initialize the new chunk.  */
   new_chunk = CALL_CHUNKFUN (h, new_size);
   if (!new_chunk)
-    (*obstack_alloc_failed_handler) ();
+    (*obstack_alloc_failed_handler)();
   h->chunk = new_chunk;
   new_chunk->prev = old_chunk;
   new_chunk->limit = h->chunk_limit = (char *) new_chunk + new_size;
 
+  /* Compute an aligned object_base in the new chunk */
+  object_base =
+    __PTR_ALIGN ((char *) new_chunk, new_chunk->contents, h->alignment_mask);
+
   /* Move the existing object to the new chunk.
      Word at a time is fast and is safe if the object
      is sufficiently aligned.  */
@@ -264,8 +271,8 @@ _obstack_newchunk (struct obstack *h, int length)
     {
       for (i = obj_size / sizeof (COPYING_UNIT) - 1;
 	   i >= 0; i--)
-	((COPYING_UNIT *)new_chunk->contents)[i]
+	((COPYING_UNIT *) object_base)[i]
-	  = ((COPYING_UNIT *)h->object_base)[i];
+	  = ((COPYING_UNIT *) h->object_base)[i];
       /* We used to copy the odd few remaining bytes as one extra COPYING_UNIT,
 	 but that can cross a page boundary on a machine
 	 which does not do strict alignment for COPYING_UNITS.  */
@@ -275,22 +282,28 @@ _obstack_newchunk (struct obstack *h, int length)
     already = 0;
   /* Copy remaining bytes one by one.  */
   for (i = already; i < obj_size; i++)
-    new_chunk->contents[i] = h->object_base[i];
+    object_base[i] = h->object_base[i];
 
   /* If the object just copied was the only data in OLD_CHUNK,
      free that chunk and remove it from the chain.
      But not if that chunk might contain an empty object.  */
-  if (h->object_base == old_chunk->contents && ! h->maybe_empty_object)
+  if (!h->maybe_empty_object
+      && (h->object_base
+	  == __PTR_ALIGN ((char *) old_chunk, old_chunk->contents,
+			  h->alignment_mask)))
     {
       new_chunk->prev = old_chunk->prev;
       CALL_FREEFUN (h, old_chunk);
     }
 
-  h->object_base = new_chunk->contents;
+  h->object_base = object_base;
   h->next_free = h->object_base + obj_size;
   /* The new chunk certainly contains no empty object yet.  */
   h->maybe_empty_object = 0;
 }
+# ifdef _LIBC
+libc_hidden_def (_obstack_newchunk)
+# endif
 
 /* Return nonzero if object OBJ has been allocated from obstack H.
    This is here for debugging.
@@ -298,45 +311,42 @@ _obstack_newchunk (struct obstack *h, int length)
 
 /* Suppress -Wmissing-prototypes warning.  We don't want to declare this in
    obstack.h because it is just for debugging.  */
-int _obstack_allocated_p (struct obstack *h, POINTER obj);
+int _obstack_allocated_p (struct obstack *h, void *obj) __attribute_pure__;
 
 int
-_obstack_allocated_p (struct obstack *h, POINTER obj)
+_obstack_allocated_p (struct obstack *h, void *obj)
 {
-  register struct _obstack_chunk *lp;	/* below addr of any objects in this chunk */
+  struct _obstack_chunk *lp;    /* below addr of any objects in this chunk */
-  register struct _obstack_chunk *plp;	/* point to previous chunk if any */
+  struct _obstack_chunk *plp;   /* point to previous chunk if any */
 
   lp = (h)->chunk;
   /* We use >= rather than > since the object cannot be exactly at
      the beginning of the chunk but might be an empty object exactly
      at the end of an adjacent chunk.  */
-  while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
+  while (lp != 0 && ((void *) lp >= obj || (void *) (lp)->limit < obj))
     {
       plp = lp->prev;
       lp = plp;
     }
   return lp != 0;
 }
-
+
 /* Free objects in obstack H, including OBJ and everything allocate
    more recently than OBJ.  If OBJ is zero, free everything in H.  */
 
-#undef obstack_free
+# undef obstack_free
-
-/* This function has two names with identical definitions.
-   This is the first one, called from non-ANSI code.  */
 
 void
-_obstack_free (struct obstack *h, POINTER obj)
+__obstack_free (struct obstack *h, void *obj)
 {
-  register struct _obstack_chunk *lp;	/* below addr of any objects in this chunk */
+  struct _obstack_chunk *lp;    /* below addr of any objects in this chunk */
-  register struct _obstack_chunk *plp;	/* point to previous chunk if any */
+  struct _obstack_chunk *plp;   /* point to previous chunk if any */
 
   lp = h->chunk;
   /* We use >= because there cannot be an object at the beginning of a chunk.
      But there can be an empty object at that address
      at the end of another chunk.  */
-  while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
+  while (lp != 0 && ((void *) lp >= obj || (void *) (lp)->limit < obj))
     {
       plp = lp->prev;
       CALL_FREEFUN (h, lp);
@@ -356,43 +366,17 @@ _obstack_free (struct obstack *h, POINTER obj)
     abort ();
 }
 
-/* This function is used from ANSI code.  */
+# ifdef _LIBC
+/* Older versions of libc used a function _obstack_free intended to be
+   called by non-GCC compilers.  */
+strong_alias (obstack_free, _obstack_free)
+# endif
 
-void
-obstack_free (struct obstack *h, POINTER obj)
-{
-  register struct _obstack_chunk *lp;	/* below addr of any objects in this chunk */
-  register struct _obstack_chunk *plp;	/* point to previous chunk if any */
-
-  lp = h->chunk;
-  /* We use >= because there cannot be an object at the beginning of a chunk.
-     But there can be an empty object at that address
-     at the end of another chunk.  */
-  while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj))
-    {
-      plp = lp->prev;
-      CALL_FREEFUN (h, lp);
-      lp = plp;
-      /* If we switch chunks, we can't tell whether the new current
-	 chunk contains an empty object, so assume that it may.  */
-      h->maybe_empty_object = 1;
-    }
-  if (lp)
-    {
-      h->object_base = h->next_free = (char *) (obj);
-      h->chunk_limit = lp->limit;
-      h->chunk = lp;
-    }
-  else if (obj != 0)
-    /* obj is not in any of the chunks! */
-    abort ();
-}
-
 int
 _obstack_memory_used (struct obstack *h)
 {
-  register struct _obstack_chunk* lp;
+  struct _obstack_chunk *lp;
-  register int nbytes = 0;
+  int nbytes = 0;
 
   for (lp = h->chunk; lp != 0; lp = lp->prev)
     {
@@ -400,111 +384,36 @@ _obstack_memory_used (struct obstack *h)
     }
   return nbytes;
 }
-
+
-/* Define the error handler.  */
+#  if defined _LIBC || (HAVE_LIBINTL_H && ENABLE_NLS)
-#ifndef _
-# if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
 #   include <libintl.h>
 #   ifndef _
-#   define _(Str) gettext (Str)
+#    define _(msgid) gettext (msgid)
 #   endif
 #  else
-#  define _(Str) (Str)
+#   ifndef _
+#    define _(msgid) (msgid)
+#   endif
 #  endif
-#endif
 
-static void
+# ifdef _LIBC
+#  include <libio/iolibio.h>
+# endif
+
+static _Noreturn void
 print_and_abort (void)
 {
-  fputs (_("memory exhausted\n"), stderr);
+  /* Don't change any of these strings.  Yes, it would be possible to add
+     the newline to the string and use fputs or so.  But this must not
+     happen because the "memory exhausted" message appears in other places
+     like this and the translation should be reused instead of creating
+     a very similar string which requires a separate translation.  */
+# ifdef _LIBC
+  (void) __fxprintf (NULL, "%s\n", _("memory exhausted"));
+# else
+  fprintf (stderr, "%s\n", _("memory exhausted"));
+# endif
   exit (obstack_exit_failure);
 }
-
-#if 0
-/* These are now turned off because the applications do not use it
-   and it uses bcopy via obstack_grow, which causes trouble on sysV.  */
-
-/* Now define the functional versions of the obstack macros.
-   Define them to simply use the corresponding macros to do the job.  */
-
-/* The function names appear in parentheses in order to prevent
-   the macro-definitions of the names from being expanded there.  */
-
-POINTER (obstack_base) (struct obstack *obstack)
-{
-  return obstack_base (obstack);
-}
-
-POINTER (obstack_next_free) (struct obstack *obstack)
-{
-  return obstack_next_free (obstack);
-}
-
-int (obstack_object_size) (struct obstack *obstack)
-{
-  return obstack_object_size (obstack);
-}
-
-int (obstack_room) (struct obstack *obstack)
-{
-  return obstack_room (obstack);
-}
-
-int (obstack_make_room) (struct obstack *obstack, int length)
-{
-  return obstack_make_room (obstack, length);
-}
-
-void (obstack_grow) (struct obstack *obstack, POINTER pointer, int length)
-{
-  obstack_grow (obstack, pointer, length);
-}
-
-void (obstack_grow0) (struct obstack *obstack, POINTER pointer, int length)
-{
-  obstack_grow0 (obstack, pointer, length);
-}
-
-void (obstack_1grow) (struct obstack *obstack, int character)
-{
-  obstack_1grow (obstack, character);
-}
-
-void (obstack_blank) (struct obstack *obstack, int length)
-{
-  obstack_blank (obstack, length);
-}
-
-void (obstack_1grow_fast) (struct obstack *obstack, int character)
-{
-  obstack_1grow_fast (obstack, character);
-}
-
-void (obstack_blank_fast) (struct obstack *obstack, int length)
-{
-  obstack_blank_fast (obstack, length);
-}
-
-POINTER (obstack_finish) (struct obstack *obstack)
-{
-  return obstack_finish (obstack);
-}
-
-POINTER (obstack_alloc) (struct obstack *obstack, int length)
-{
-  return obstack_alloc (obstack, length);
-}
-
-POINTER (obstack_copy) (struct obstack *obstack, POINTER pointer, int length)
-{
-  return obstack_copy (obstack, pointer, length);
-}
-
-POINTER (obstack_copy0) (struct obstack *obstack, POINTER pointer, int length)
-{
-  return obstack_copy0 (obstack, pointer, length);
-}
-
-#endif /* 0 */
 
 #endif  /* !ELIDE_CODE */

obstack.h

@@ -1,96 +1,90 @@
 /* obstack.h - object stack macros
-   Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998,
+   Copyright (C) 1988-2023 Free Software Foundation, Inc.
-   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+   This file is part of the GNU C Library.
-   Free Software Foundation, Inc.
 
+   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.
 
-   NOTE: The canonical source of this file is maintained with the GNU C Library.
+   The GNU C Library is distributed in the hope that it will be useful,
-   Bugs can be reported to bug-glibc@gnu.org.
-
-   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 2, 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
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   GNU General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Lesser General Public
-   along with this program; if not, write to the Free Software
+   License along with the GNU C Library; if not, see
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301,
+   <https://www.gnu.org/licenses/>.  */
-   USA.  */
 
 /* Summary:
 
-All the apparent functions defined here are macros. The idea
+   All the apparent functions defined here are macros. The idea
-is that you would use these pre-tested macros to solve a
+   is that you would use these pre-tested macros to solve a
-very specific set of problems, and they would run fast.
+   very specific set of problems, and they would run fast.
-Caution: no side-effects in arguments please!! They may be
+   Caution: no side-effects in arguments please!! They may be
-evaluated MANY times!!
+   evaluated MANY times!!
 
-These macros operate a stack of objects.  Each object starts life
+   These macros operate a stack of objects.  Each object starts life
-small, and may grow to maturity.  (Consider building a word syllable
+   small, and may grow to maturity.  (Consider building a word syllable
-by syllable.)  An object can move while it is growing.  Once it has
+   by syllable.)  An object can move while it is growing.  Once it has
-been "finished" it never changes address again.  So the "top of the
+   been "finished" it never changes address again.  So the "top of the
-stack" is typically an immature growing object, while the rest of the
+   stack" is typically an immature growing object, while the rest of the
-stack is of mature, fixed size and fixed address objects.
+   stack is of mature, fixed size and fixed address objects.
 
-These routines grab large chunks of memory, using a function you
+   These routines grab large chunks of memory, using a function you
-supply, called `obstack_chunk_alloc'.  On occasion, they free chunks,
+   supply, called 'obstack_chunk_alloc'.  On occasion, they free chunks,
-by calling `obstack_chunk_free'.  You must define them and declare
+   by calling 'obstack_chunk_free'.  You must define them and declare
-them before using any obstack macros.
+   them before using any obstack macros.
 
-Each independent stack is represented by a `struct obstack'.
+   Each independent stack is represented by a 'struct obstack'.
-Each of the obstack macros expects a pointer to such a structure
+   Each of the obstack macros expects a pointer to such a structure
-as the first argument.
+   as the first argument.
 
-One motivation for this package is the problem of growing char strings
+   One motivation for this package is the problem of growing char strings
-in symbol tables.  Unless you are "fascist pig with a read-only mind"
+   in symbol tables.  Unless you are "fascist pig with a read-only mind"
---Gosper's immortal quote from HAKMEM item 154, out of context--you
+   --Gosper's immortal quote from HAKMEM item 154, out of context--you
-would not like to put any arbitrary upper limit on the length of your
+   would not like to put any arbitrary upper limit on the length of your
-symbols.
+   symbols.
 
-In practice this often means you will build many short symbols and a
+   In practice this often means you will build many short symbols and a
-few long symbols.  At the time you are reading a symbol you don't know
+   few long symbols.  At the time you are reading a symbol you don't know
-how long it is.  One traditional method is to read a symbol into a
+   how long it is.  One traditional method is to read a symbol into a
-buffer, realloc()ating the buffer every time you try to read a symbol
+   buffer, realloc()ating the buffer every time you try to read a symbol
-that is longer than the buffer.  This is beaut, but you still will
+   that is longer than the buffer.  This is beaut, but you still will
-want to copy the symbol from the buffer to a more permanent
+   want to copy the symbol from the buffer to a more permanent
-symbol-table entry say about half the time.
+   symbol-table entry say about half the time.
 
-With obstacks, you can work differently.  Use one obstack for all symbol
+   With obstacks, you can work differently.  Use one obstack for all symbol
-names.  As you read a symbol, grow the name in the obstack gradually.
+   names.  As you read a symbol, grow the name in the obstack gradually.
-When the name is complete, finalize it.  Then, if the symbol exists already,
+   When the name is complete, finalize it.  Then, if the symbol exists already,
-free the newly read name.
+   free the newly read name.
 
-The way we do this is to take a large chunk, allocating memory from
+   The way we do this is to take a large chunk, allocating memory from
-low addresses.  When you want to build a symbol in the chunk you just
+   low addresses.  When you want to build a symbol in the chunk you just
-add chars above the current "high water mark" in the chunk.  When you
+   add chars above the current "high water mark" in the chunk.  When you
-have finished adding chars, because you got to the end of the symbol,
+   have finished adding chars, because you got to the end of the symbol,
-you know how long the chars are, and you can create a new object.
+   you know how long the chars are, and you can create a new object.
-Mostly the chars will not burst over the highest address of the chunk,
+   Mostly the chars will not burst over the highest address of the chunk,
-because you would typically expect a chunk to be (say) 100 times as
+   because you would typically expect a chunk to be (say) 100 times as
-long as an average object.
+   long as an average object.
 
-In case that isn't clear, when we have enough chars to make up
+   In case that isn't clear, when we have enough chars to make up
-the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed)
+   the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed)
-so we just point to it where it lies.  No moving of chars is
+   so we just point to it where it lies.  No moving of chars is
-needed and this is the second win: potentially long strings need
+   needed and this is the second win: potentially long strings need
-never be explicitly shuffled. Once an object is formed, it does not
+   never be explicitly shuffled. Once an object is formed, it does not
-change its address during its lifetime.
+   change its address during its lifetime.
 
-When the chars burst over a chunk boundary, we allocate a larger
+   When the chars burst over a chunk boundary, we allocate a larger
-chunk, and then copy the partly formed object from the end of the old
+   chunk, and then copy the partly formed object from the end of the old
-chunk to the beginning of the new larger chunk.  We then carry on
+   chunk to the beginning of the new larger chunk.  We then carry on
-accreting characters to the end of the object as we normally would.
+   accreting characters to the end of the object as we normally would.
 
-A special macro is provided to add a single char at a time to a
+   A special macro is provided to add a single char at a time to a
-growing object.  This allows the use of register variables, which
+   growing object.  This allows the use of register variables, which
-break the ordinary 'growth' macro.
+   break the ordinary 'growth' macro.
 
-Summary:
+   Summary:
 	We allocate large chunks.
 	We carve out one object at a time from the current chunk.
 	Once carved, an object never moves.
@@ -99,10 +93,10 @@ Summary:
 	Exactly one object is growing in an obstack at any one time.
 	You can run one obstack per control block.
 	You may have as many control blocks as you dare.
-	Because of the way we do it, you can `unwind' an obstack
+	Because of the way we do it, you can "unwind" an obstack
 	  back to a previous state. (You may remove objects much
 	  as you would with a stack.)
-*/
+ */
 
 
 /* Don't do the contents of this file more than once.  */
@@ -110,48 +104,47 @@ Summary:
 #ifndef _OBSTACK_H
 #define _OBSTACK_H 1
 
-#ifdef __cplusplus
+/* We need the type of a pointer subtraction.  If __PTRDIFF_TYPE__ is
-extern "C" {
-#endif
-
-/* We use subtraction of (char *) 0 instead of casting to int
-   because on word-addressable machines a simple cast to int
-   may ignore the byte-within-word field of the pointer.  */
-
-#ifndef __PTR_TO_INT
-# define __PTR_TO_INT(P) ((P) - (char *) 0)
-#endif
-
-#ifndef __INT_TO_PTR
-# define __INT_TO_PTR(P) ((P) + (char *) 0)
-#endif
-
-/* We need the type of the resulting object.  If __PTRDIFF_TYPE__ is
    defined, as with GNU C, use that; that way we don't pollute the
-   namespace with <stddef.h>'s symbols.  Otherwise, if <stddef.h> is
+   namespace with <stddef.h>'s symbols.  Otherwise, include <stddef.h>
-   available, include it and use ptrdiff_t.  In traditional C, long is
+   and use ptrdiff_t.  */
-   the best that we can do.  */
 
 #ifdef __PTRDIFF_TYPE__
 # define PTR_INT_TYPE __PTRDIFF_TYPE__
 #else
-# ifdef HAVE_STDDEF_H
 # include <stddef.h>
 # define PTR_INT_TYPE ptrdiff_t
+#endif
+
+/* If B is the base of an object addressed by P, return the result of
+   aligning P to the next multiple of A + 1.  B and P must be of type
+   char *.  A + 1 must be a power of 2.  */
+
+#define __BPTR_ALIGN(B, P, A) ((B) + (((P) - (B) + (A)) & ~(A)))
+
+/* Similar to _BPTR_ALIGN (B, P, A), except optimize the common case
+   where pointers can be converted to integers, aligned as integers,
+   and converted back again.  If PTR_INT_TYPE is narrower than a
+   pointer (e.g., the AS/400), play it safe and compute the alignment
+   relative to B.  Otherwise, use the faster strategy of computing the
+   alignment relative to 0.  */
+
+#define __PTR_ALIGN(B, P, A)						      \
+  __BPTR_ALIGN (sizeof (PTR_INT_TYPE) < sizeof (void *) ? (B) : (char *) 0, \
+		P, A)
+
+#include <string.h>
+
+#ifndef __attribute_pure__
+# if defined __GNUC_MINOR__ && __GNUC__ * 1000 + __GNUC_MINOR__ >= 2096
+#  define __attribute_pure__ __attribute__ ((__pure__))
 # else
-#  define PTR_INT_TYPE long
+#  define __attribute_pure__
 # endif
 #endif
 
-#if defined _LIBC || defined HAVE_STRING_H
+#ifdef __cplusplus
-# include <string.h>
+extern "C" {
-# define _obstack_memcpy(To, From, N) memcpy ((To), (From), (N))
-#else
-# ifdef memcpy
-#  define _obstack_memcpy(To, From, N) memcpy ((To), (char *)(From), (N))
-# else
-#  define _obstack_memcpy(To, From, N) bcopy ((char *)(From), (To), (N))
-# endif
 #endif
 
 struct _obstack_chunk           /* Lives at front of each chunk. */
@@ -168,20 +161,24 @@ struct obstack		/* control current object in current chunk */
   char *object_base;            /* address of object we are building */
   char *next_free;              /* where to add next char to current object */
   char *chunk_limit;            /* address of char after current chunk */
-  PTR_INT_TYPE temp;		/* Temporary for some macros.  */
+  union
+  {
+    PTR_INT_TYPE tempint;
+    void *tempptr;
+  } temp;                       /* Temporary for some macros.  */
   int alignment_mask;           /* Mask of alignment for each object. */
-  /* These prototypes vary based on `use_extra_arg', and we use
+  /* These prototypes vary based on 'use_extra_arg', and we use
      casts to the prototypeless function type in all assignments,
      but having prototypes here quiets -Wstrict-prototypes.  */
   struct _obstack_chunk *(*chunkfun) (void *, long);
   void (*freefun) (void *, struct _obstack_chunk *);
   void *extra_arg;              /* first arg for chunk alloc/dealloc funcs */
-  unsigned use_extra_arg:1;	/* chunk alloc/dealloc funcs take extra arg */
+  unsigned use_extra_arg : 1;     /* chunk alloc/dealloc funcs take extra arg */
-  unsigned maybe_empty_object:1;/* There is a possibility that the current
+  unsigned maybe_empty_object : 1; /* There is a possibility that the current
 				      chunk contains a zero-length object.  This
 				      prevents freeing the chunk if we allocate
 				      a bigger chunk to replace it. */
-  unsigned alloc_failed:1;	/* No longer used, as we now call the failed
+  unsigned alloc_failed : 1;      /* No longer used, as we now call the failed
 				     handler on error, but retained for binary
 				     compatibility.  */
 };
@@ -189,65 +186,35 @@ struct obstack		/* control current object in current chunk */
 /* Declare the external functions we use; they are in obstack.c.  */
 
 extern void _obstack_newchunk (struct obstack *, int);
-extern void _obstack_free (struct obstack *, void *);
 extern int _obstack_begin (struct obstack *, int, int,
-			    void *(*) (long), void (*) (void *));
+			   void *(*)(long), void (*)(void *));
 extern int _obstack_begin_1 (struct obstack *, int, int,
-			     void *(*) (void *, long),
+			     void *(*)(void *, long),
-			     void (*) (void *, void *), void *);
+			     void (*)(void *, void *), void *);
-extern int _obstack_memory_used (struct obstack *);
+extern int _obstack_memory_used (struct obstack *) __attribute_pure__;
-
-/* Do the function-declarations after the structs
-   but before defining the macros.  */
 
-void obstack_init (struct obstack *obstack);
+/* The default name of the function for freeing a chunk is 'obstack_free',
+   but gnulib users can override this by defining '__obstack_free'.  */
+#ifndef __obstack_free
+# define __obstack_free obstack_free
+#endif
+extern void __obstack_free (struct obstack *, void *);
 
-void * obstack_alloc (struct obstack *obstack, int size);
 
-void * obstack_copy (struct obstack *obstack, void *address, int size);
+/* Error handler called when 'obstack_chunk_alloc' failed to allocate
-void * obstack_copy0 (struct obstack *obstack, void *address, int size);
+   more memory.  This can be set to a user defined function which
-
+   should either abort gracefully or use longjump - but shouldn't
-void obstack_free (struct obstack *obstack, void *block);
+   return.  The default action is to print a message and abort.  */
-
-void obstack_blank (struct obstack *obstack, int size);
-
-void obstack_grow (struct obstack *obstack, void *data, int size);
-void obstack_grow0 (struct obstack *obstack, void *data, int size);
-
-void obstack_1grow (struct obstack *obstack, int data_char);
-void obstack_ptr_grow (struct obstack *obstack, void *data);
-void obstack_int_grow (struct obstack *obstack, int data);
-
-void * obstack_finish (struct obstack *obstack);
-
-int obstack_object_size (struct obstack *obstack);
-
-int obstack_room (struct obstack *obstack);
-void obstack_make_room (struct obstack *obstack, int size);
-void obstack_1grow_fast (struct obstack *obstack, int data_char);
-void obstack_ptr_grow_fast (struct obstack *obstack, void *data);
-void obstack_int_grow_fast (struct obstack *obstack, int data);
-void obstack_blank_fast (struct obstack *obstack, int size);
-
-void * obstack_base (struct obstack *obstack);
-void * obstack_next_free (struct obstack *obstack);
-int obstack_alignment_mask (struct obstack *obstack);
-int obstack_chunk_size (struct obstack *obstack);
-int obstack_memory_used (struct obstack *obstack);
-
-/* Error handler called when `obstack_chunk_alloc' failed to allocate
-   more memory.  This can be set to a user defined function.  The
-   default action is to print a message and abort.  */
 extern void (*obstack_alloc_failed_handler) (void);
 
-/* Exit value used when `print_and_abort' is used.  */
+/* Exit value used when 'print_and_abort' is used.  */
 extern int obstack_exit_failure;
-
+
 /* Pointer to beginning of object being allocated or to be allocated next.
    Note that this might not be the final address of the object
    because a new chunk might be needed to hold the final size.  */
 
-#define obstack_base(h) ((h)->object_base)
+#define obstack_base(h) ((void *) (h)->object_base)
 
 /* Size for allocating ordinary chunks.  */
 
@@ -261,63 +228,62 @@ extern int obstack_exit_failure;
 
 #define obstack_alignment_mask(h) ((h)->alignment_mask)
 
-/* To prevent prototype warnings provide complete argument list in
+/* To prevent prototype warnings provide complete argument list.  */
-   standard C version.  */
+#define obstack_init(h)							      \
-# define obstack_init(h) \
   _obstack_begin ((h), 0, 0,						      \
-		  (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free)
+		  (void *(*)(long))obstack_chunk_alloc,			      \
+		  (void (*)(void *))obstack_chunk_free)
 
-# define obstack_begin(h, size) \
+#define obstack_begin(h, size)						      \
   _obstack_begin ((h), (size), 0,					      \
-		  (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free)
+		  (void *(*)(long))obstack_chunk_alloc,			      \
+		  (void (*)(void *))obstack_chunk_free)
 
-# define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \
+#define obstack_specify_allocation(h, size, alignment, chunkfun, freefun)  \
   _obstack_begin ((h), (size), (alignment),				      \
-		    (void *(*) (long)) (chunkfun), (void (*) (void *)) (freefun))
+		  (void *(*)(long))(chunkfun),				      \
+		  (void (*)(void *))(freefun))
 
-# define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
+#define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \
   _obstack_begin_1 ((h), (size), (alignment),				      \
-		    (void *(*) (void *, long)) (chunkfun), \
+		    (void *(*)(void *, long))(chunkfun),		      \
-		    (void (*) (void *, void *)) (freefun), (arg))
+		    (void (*)(void *, void *))(freefun), (arg))
 
-# define obstack_chunkfun(h, newchunkfun) \
+#define obstack_chunkfun(h, newchunkfun) \
-  ((h) -> chunkfun = (struct _obstack_chunk *(*)(void *, long)) (newchunkfun))
+  ((h)->chunkfun = (struct _obstack_chunk *(*)(void *, long))(newchunkfun))
 
-# define obstack_freefun(h, newfreefun) \
+#define obstack_freefun(h, newfreefun) \
-  ((h) -> freefun = (void (*)(void *, struct _obstack_chunk *)) (newfreefun))
+  ((h)->freefun = (void (*)(void *, struct _obstack_chunk *))(newfreefun))
 
-#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = (achar))
+#define obstack_1grow_fast(h, achar) (*((h)->next_free)++ = (achar))
 
-#define obstack_blank_fast(h,n) ((h)->next_free += (n))
+#define obstack_blank_fast(h, n) ((h)->next_free += (n))
 
 #define obstack_memory_used(h) _obstack_memory_used (h)
-
+
-#if defined __GNUC__ && defined __STDC__ && __STDC__
+#if defined __GNUC__
-/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
+# if ! (2 < __GNUC__ + (8 <= __GNUC_MINOR__))
-   does not implement __extension__.  But that compiler doesn't define
-   __GNUC_MINOR__.  */
-# if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__)
 #  define __extension__
 # endif
 
 /* For GNU C, if not -traditional,
    we can define these macros to compute all args only once
    without using a global variable.
-   Also, we can avoid using the `temp' slot, to make faster code.  */
+   Also, we can avoid using the 'temp' slot, to make faster code.  */
 
 # define obstack_object_size(OBSTACK)					      \
   __extension__								      \
-  ({ struct obstack *__o = (OBSTACK);					\
+    ({ struct obstack const *__o = (OBSTACK);				      \
        (unsigned) (__o->next_free - __o->object_base); })
 
 # define obstack_room(OBSTACK)						      \
   __extension__								      \
-  ({ struct obstack *__o = (OBSTACK);					\
+    ({ struct obstack const *__o = (OBSTACK);				      \
        (unsigned) (__o->chunk_limit - __o->next_free); })
 
-# define obstack_make_room(OBSTACK,length)				\
+# define obstack_make_room(OBSTACK, length)				      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__o = (OBSTACK);					\
+    ({ struct obstack *__o = (OBSTACK);					      \
        int __len = (length);						      \
        if (__o->chunk_limit - __o->next_free < __len)			      \
 	 _obstack_newchunk (__o, __len);				      \
@@ -325,124 +291,128 @@ __extension__								\
 
 # define obstack_empty_p(OBSTACK)					      \
   __extension__								      \
-  ({ struct obstack *__o = (OBSTACK);					\
+    ({ struct obstack const *__o = (OBSTACK);				      \
-     (__o->chunk->prev == 0 && __o->next_free - __o->chunk->contents == 0); })
+       (__o->chunk->prev == 0						      \
+	&& __o->next_free == __PTR_ALIGN ((char *) __o->chunk,		      \
+					  __o->chunk->contents,		      \
+					  __o->alignment_mask)); })
 
-# define obstack_grow(OBSTACK,where,length)				\
+# define obstack_grow(OBSTACK, where, length)				      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__o = (OBSTACK);					\
+    ({ struct obstack *__o = (OBSTACK);					      \
        int __len = (length);						      \
        if (__o->next_free + __len > __o->chunk_limit)			      \
 	 _obstack_newchunk (__o, __len);				      \
-   _obstack_memcpy (__o->next_free, (where), __len);			\
+       memcpy (__o->next_free, where, __len);				      \
        __o->next_free += __len;						      \
        (void) 0; })
 
-# define obstack_grow0(OBSTACK,where,length)				\
+# define obstack_grow0(OBSTACK, where, length)				      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__o = (OBSTACK);					\
+    ({ struct obstack *__o = (OBSTACK);					      \
        int __len = (length);						      \
        if (__o->next_free + __len + 1 > __o->chunk_limit)		      \
 	 _obstack_newchunk (__o, __len + 1);				      \
-   _obstack_memcpy (__o->next_free, (where), __len);			\
+       memcpy (__o->next_free, where, __len);				      \
        __o->next_free += __len;						      \
        *(__o->next_free)++ = 0;						      \
        (void) 0; })
 
-# define obstack_1grow(OBSTACK,datum)					\
+# define obstack_1grow(OBSTACK, datum)					      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__o = (OBSTACK);					\
+    ({ struct obstack *__o = (OBSTACK);					      \
        if (__o->next_free + 1 > __o->chunk_limit)			      \
 	 _obstack_newchunk (__o, 1);					      \
        obstack_1grow_fast (__o, datum);					      \
        (void) 0; })
 
-/* These assume that the obstack alignment is good enough for pointers or ints,
+/* These assume that the obstack alignment is good enough for pointers
-   and that the data added so far to the current object
+   or ints, and that the data added so far to the current object
    shares that much alignment.  */
 
-# define obstack_ptr_grow(OBSTACK,datum)				\
+# define obstack_ptr_grow(OBSTACK, datum)				      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__o = (OBSTACK);					\
+    ({ struct obstack *__o = (OBSTACK);					      \
        if (__o->next_free + sizeof (void *) > __o->chunk_limit)		      \
 	 _obstack_newchunk (__o, sizeof (void *));			      \
-   obstack_ptr_grow_fast (__o, datum); })
+       obstack_ptr_grow_fast (__o, datum); })				      \
 
-# define obstack_int_grow(OBSTACK,datum)				\
+# define obstack_int_grow(OBSTACK, datum)				      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__o = (OBSTACK);					\
+    ({ struct obstack *__o = (OBSTACK);					      \
        if (__o->next_free + sizeof (int) > __o->chunk_limit)		      \
 	 _obstack_newchunk (__o, sizeof (int));				      \
        obstack_int_grow_fast (__o, datum); })
 
-# define obstack_ptr_grow_fast(OBSTACK,aptr)				\
+# define obstack_ptr_grow_fast(OBSTACK, aptr)				      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__o1 = (OBSTACK);					\
+    ({ struct obstack *__o1 = (OBSTACK);				      \
-   *(const void **) __o1->next_free = (aptr);				\
+       void *__p1 = __o1->next_free;					      \
+       *(const void **) __p1 = (aptr);					      \
        __o1->next_free += sizeof (const void *);			      \
        (void) 0; })
 
-# define obstack_int_grow_fast(OBSTACK,aint)				\
+# define obstack_int_grow_fast(OBSTACK, aint)				      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__o1 = (OBSTACK);					\
+    ({ struct obstack *__o1 = (OBSTACK);				      \
-   *(int *) __o1->next_free = (aint);					\
+       void *__p1 = __o1->next_free;					      \
+       *(int *) __p1 = (aint);						      \
        __o1->next_free += sizeof (int);					      \
        (void) 0; })
 
-# define obstack_blank(OBSTACK,length)					\
+# define obstack_blank(OBSTACK, length)					      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__o = (OBSTACK);					\
+    ({ struct obstack *__o = (OBSTACK);					      \
        int __len = (length);						      \
        if (__o->chunk_limit - __o->next_free < __len)			      \
 	 _obstack_newchunk (__o, __len);				      \
        obstack_blank_fast (__o, __len);					      \
        (void) 0; })
 
-# define obstack_alloc(OBSTACK,length)					\
+# define obstack_alloc(OBSTACK, length)					      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__h = (OBSTACK);					\
+    ({ struct obstack *__h = (OBSTACK);					      \
        obstack_blank (__h, (length));					      \
        obstack_finish (__h); })
 
-# define obstack_copy(OBSTACK,where,length)				\
+# define obstack_copy(OBSTACK, where, length)				      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__h = (OBSTACK);					\
+    ({ struct obstack *__h = (OBSTACK);					      \
        obstack_grow (__h, (where), (length));				      \
        obstack_finish (__h); })
 
-# define obstack_copy0(OBSTACK,where,length)				\
+# define obstack_copy0(OBSTACK, where, length)				      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__h = (OBSTACK);					\
+    ({ struct obstack *__h = (OBSTACK);					      \
        obstack_grow0 (__h, (where), (length));				      \
        obstack_finish (__h); })
 
 /* The local variable is named __o1 to avoid a name conflict
    when obstack_blank is called.  */
 # define obstack_finish(OBSTACK)					      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__o1 = (OBSTACK);					\
+    ({ struct obstack *__o1 = (OBSTACK);				      \
-   void *value;								\
+       void *__value = (void *) __o1->object_base;			      \
-   value = (void *) __o1->object_base;					\
+       if (__o1->next_free == __value)					      \
-   if (__o1->next_free == value)					\
 	 __o1->maybe_empty_object = 1;					      \
        __o1->next_free							      \
-     = __INT_TO_PTR ((__PTR_TO_INT (__o1->next_free)+__o1->alignment_mask)\
+	 = __PTR_ALIGN (__o1->object_base, __o1->next_free,		      \
-		     & ~ (__o1->alignment_mask));			\
+			__o1->alignment_mask);				      \
-   if (__o1->next_free - (char *)__o1->chunk				\
+       if (__o1->next_free - (char *) __o1->chunk			      \
-       > __o1->chunk_limit - (char *)__o1->chunk)			\
+	   > __o1->chunk_limit - (char *) __o1->chunk)			      \
 	 __o1->next_free = __o1->chunk_limit;				      \
        __o1->object_base = __o1->next_free;				      \
-   value; })
+       __value; })
 
 # define obstack_free(OBSTACK, OBJ)					      \
-__extension__								\
+  __extension__								      \
-({ struct obstack *__o = (OBSTACK);					\
+    ({ struct obstack *__o = (OBSTACK);					      \
-   void *__obj = (void *) (OBJ);					\
+       void *__obj = (OBJ);						      \
-   if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit)  \
+       if (__obj > (void *) __o->chunk && __obj < (void *) __o->chunk_limit)  \
 	 __o->next_free = __o->object_base = (char *) __obj;		      \
-   else (obstack_free) (__o, __obj); })
+       else (__obstack_free) (__o, __obj); })
-
+
-#else /* not __GNUC__ or not __STDC__ */
+#else /* not __GNUC__ */
 
 # define obstack_object_size(h) \
   (unsigned) ((h)->next_free - (h)->object_base)
@@ -451,7 +421,10 @@ __extension__								\
   (unsigned) ((h)->chunk_limit - (h)->next_free)
 
 # define obstack_empty_p(h) \
- ((h)->chunk->prev == 0 && (h)->next_free - (h)->chunk->contents == 0)
+  ((h)->chunk->prev == 0						      \
+   && (h)->next_free == __PTR_ALIGN ((char *) (h)->chunk,		      \
+				     (h)->chunk->contents,		      \
+				     (h)->alignment_mask))
 
 /* Note that the call to _obstack_newchunk is enclosed in (..., 0)
    so that we can avoid having void expressions
@@ -459,84 +432,85 @@ __extension__								\
    Casting the third operand to void was tried before,
    but some compilers won't accept it.  */
 
-# define obstack_make_room(h,length)					\
+# define obstack_make_room(h, length)					      \
-( (h)->temp = (length),							\
+  ((h)->temp.tempint = (length),					      \
-  (((h)->next_free + (h)->temp > (h)->chunk_limit)			\
+   (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)		      \
-   ? (_obstack_newchunk ((h), (h)->temp), 0) : 0))
+   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0))
 
-# define obstack_grow(h,where,length)					\
+# define obstack_grow(h, where, length)					      \
-( (h)->temp = (length),							\
+  ((h)->temp.tempint = (length),					      \
-  (((h)->next_free + (h)->temp > (h)->chunk_limit)			\
+   (((h)->next_free + (h)->temp.tempint > (h)->chunk_limit)		      \
-   ? (_obstack_newchunk ((h), (h)->temp), 0) : 0),			\
+   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),		      \
-  _obstack_memcpy ((h)->next_free, (where), (h)->temp),			\
+   memcpy ((h)->next_free, where, (h)->temp.tempint),			      \
-  (h)->next_free += (h)->temp)
+   (h)->next_free += (h)->temp.tempint)
 
-# define obstack_grow0(h,where,length)					\
+# define obstack_grow0(h, where, length)				      \
-( (h)->temp = (length),							\
+  ((h)->temp.tempint = (length),					      \
-  (((h)->next_free + (h)->temp + 1 > (h)->chunk_limit)			\
+   (((h)->next_free + (h)->temp.tempint + 1 > (h)->chunk_limit)		      \
-   ? (_obstack_newchunk ((h), (h)->temp + 1), 0) : 0),			\
+   ? (_obstack_newchunk ((h), (h)->temp.tempint + 1), 0) : 0),		      \
-  _obstack_memcpy ((h)->next_free, (where), (h)->temp),			\
+   memcpy ((h)->next_free, where, (h)->temp.tempint),			      \
-  (h)->next_free += (h)->temp,						\
+   (h)->next_free += (h)->temp.tempint,					      \
    *((h)->next_free)++ = 0)
 
-# define obstack_1grow(h,datum)						\
+# define obstack_1grow(h, datum)					      \
-( (((h)->next_free + 1 > (h)->chunk_limit)				\
+  ((((h)->next_free + 1 > (h)->chunk_limit)				      \
     ? (_obstack_newchunk ((h), 1), 0) : 0),				      \
    obstack_1grow_fast (h, datum))
 
-# define obstack_ptr_grow(h,datum)					\
+# define obstack_ptr_grow(h, datum)					      \
-( (((h)->next_free + sizeof (char *) > (h)->chunk_limit)		\
+  ((((h)->next_free + sizeof (char *) > (h)->chunk_limit)		      \
     ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0),		      \
    obstack_ptr_grow_fast (h, datum))
 
-# define obstack_int_grow(h,datum)					\
+# define obstack_int_grow(h, datum)					      \
-( (((h)->next_free + sizeof (int) > (h)->chunk_limit)			\
+  ((((h)->next_free + sizeof (int) > (h)->chunk_limit)			      \
     ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0),			      \
    obstack_int_grow_fast (h, datum))
 
-# define obstack_ptr_grow_fast(h,aptr)					\
+# define obstack_ptr_grow_fast(h, aptr)					      \
   (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr))
 
-# define obstack_int_grow_fast(h,aint)					\
+# define obstack_int_grow_fast(h, aint)					      \
-  (((int *) ((h)->next_free += sizeof (int)))[-1] = (aptr))
+  (((int *) ((h)->next_free += sizeof (int)))[-1] = (aint))
 
-# define obstack_blank(h,length)					\
+# define obstack_blank(h, length)					      \
-( (h)->temp = (length),							\
+  ((h)->temp.tempint = (length),					      \
-  (((h)->chunk_limit - (h)->next_free < (h)->temp)			\
+   (((h)->chunk_limit - (h)->next_free < (h)->temp.tempint)		      \
-   ? (_obstack_newchunk ((h), (h)->temp), 0) : 0),			\
+   ? (_obstack_newchunk ((h), (h)->temp.tempint), 0) : 0),		      \
-  obstack_blank_fast (h, (h)->temp))
+   obstack_blank_fast (h, (h)->temp.tempint))
 
-# define obstack_alloc(h,length)					\
+# define obstack_alloc(h, length)					      \
   (obstack_blank ((h), (length)), obstack_finish ((h)))
 
-# define obstack_copy(h,where,length)					\
+# define obstack_copy(h, where, length)					      \
   (obstack_grow ((h), (where), (length)), obstack_finish ((h)))
 
-# define obstack_copy0(h,where,length)					\
+# define obstack_copy0(h, where, length)				      \
   (obstack_grow0 ((h), (where), (length)), obstack_finish ((h)))
 
 # define obstack_finish(h)						      \
-( ((h)->next_free == (h)->object_base					\
+  (((h)->next_free == (h)->object_base					      \
     ? (((h)->maybe_empty_object = 1), 0)				      \
     : 0),								      \
-  (h)->temp = __PTR_TO_INT ((h)->object_base),				\
+   (h)->temp.tempptr = (h)->object_base,				      \
    (h)->next_free							      \
-    = __INT_TO_PTR ((__PTR_TO_INT ((h)->next_free)+(h)->alignment_mask)	\
+     = __PTR_ALIGN ((h)->object_base, (h)->next_free,			      \
-		    & ~ ((h)->alignment_mask)),				\
+		    (h)->alignment_mask),				      \
    (((h)->next_free - (char *) (h)->chunk				      \
      > (h)->chunk_limit - (char *) (h)->chunk)				      \
    ? ((h)->next_free = (h)->chunk_limit) : 0),				      \
    (h)->object_base = (h)->next_free,					      \
-  (void *) __INT_TO_PTR ((h)->temp))
+   (h)->temp.tempptr)
 
-# define obstack_free(h,obj)						\
+# define obstack_free(h, obj)						      \
-( (h)->temp = (char *) (obj) - (char *) (h)->chunk,			\
+  ((h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk,		      \
-  (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\
+   ((((h)->temp.tempint > 0						      \
-   ? (((h)->next_free = (h)->object_base				\
+      && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk))	      \
-	    = (h)->temp + (char *) (h)->chunk), 0)			\
+    ? (void) ((h)->next_free = (h)->object_base				      \
-   : ((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0)))
+	      = (h)->temp.tempint + (char *) (h)->chunk)		      \
+    : (__obstack_free) (h, (h)->temp.tempint + (char *) (h)->chunk)))
 
-#endif /* not __GNUC__ or not __STDC__ */
+#endif /* not __GNUC__ */
 
 #ifdef __cplusplus
 }       /* C++ */

obstack_printf.c

@@ -0,0 +1,18 @@
+#include <stdarg.h>
+#include <stdio.h>
+#include <strings.h>
+#include "obstack.h"
+
+int obstack_printf(struct obstack *obstack, const char *__restrict fmt, ...)
+{
+	char buf[1024];
+	va_list ap;
+	int len;
+
+	va_start(ap, fmt);
+	len = vsnprintf(buf, sizeof(buf), fmt, ap);
+	obstack_grow(obstack, buf, len);
+	va_end(ap);
+
+	return len;
+}