New module 'xvasprintf'.

diff --git a/ChangeLog b/ChangeLog
index 4de576ea11bf8e7fb9acf5946f65d09b6503861f..75a877fdc8ddd5b24101f1cba223a4ceeb65787e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-08  Oskar Liljeblad  <oskar@osk.mine.nu>
+
+       * modules/xvasprintf: New file.
+       * MODULES.html.sh (Extra functions based on ANSI C 89): Add vasprintf.
+
 2004-08-19  Paul Eggert  <eggert@cs.ucla.edu>
 
        * modules/userspec: Don't depend on alloca.

diff --git a/MODULES.html.sh b/MODULES.html.sh
index 096851751cf1cdfb60dbf9199dd75491634ba8a8..e149aaa6a2928e24b1584a1b6b873c420371b345 100755 (executable)
--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1558,6 +1558,7 @@ func_all_modules ()
   func_module fwriteerror
   func_module vasnprintf
   func_module vasprintf
+  func_module xvasprintf
   func_end_table
 
   element="Signal handling <signal.h>"

diff --git a/lib/ChangeLog b/lib/ChangeLog
index e77d548017836f87a88e0a1f6e78deda76ddb68c..3777beb5e87a411ac7d038442471c0d6d369f3c0 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-08  Oskar Liljeblad  <oskar@osk.mine.nu>
+
+       * xvasprintf.h: New file.
+       * xvasprintf.c: New file.
+       * xasprintf.c: New file.
+
 2004-09-08  Bruno Haible  <bruno@clisp.org>
 
        * vasnprintf.c (VASNPRINTF): Signal EOVERFLOW if the resulting length

diff --git a/lib/xasprintf.c b/lib/xasprintf.c
new file mode 100644 (file)
index 0000000..df8fd7e
--- /dev/null
+++ b/lib/xasprintf.c
@@ -0,0 +1,36 @@
+/* vasprintf and asprintf with out-of-memory checking.
+   Copyright (C) 1999, 2002-2004 Free Software Foundation, Inc.
+
+   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
+   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, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification.  */
+#include "xvasprintf.h"
+
+char *
+xasprintf (const char *format, ...)
+{
+  va_list args;
+  char *result;
+
+  va_start (args, format);
+  result = xvasprintf (format, args);
+  va_end (args);
+
+  return result;
+}

diff --git a/lib/xvasprintf.c b/lib/xvasprintf.c
new file mode 100644 (file)
index 0000000..89b5836
--- /dev/null
+++ b/lib/xvasprintf.c
@@ -0,0 +1,42 @@
+/* vasprintf and asprintf with out-of-memory checking.
+   Copyright (C) 1999, 2002-2004 Free Software Foundation, Inc.
+
+   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
+   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, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification.  */
+#include "xvasprintf.h"
+
+#include <errno.h>
+
+#include "vasprintf.h"
+
+char *
+xvasprintf (const char *format, va_list args)
+{
+  char *result;
+
+  if (vasprintf (&result, format, args) < 0)
+    {
+      if (errno == ENOMEM)
+       xmalloc_die();
+      return NULL;
+    }
+
+  return result;
+}

diff --git a/lib/xvasprintf.h b/lib/xvasprintf.h
new file mode 100644 (file)
index 0000000..95a681f
--- /dev/null
+++ b/lib/xvasprintf.h
@@ -0,0 +1,59 @@
+/* vasprintf and asprintf with out-of-memory checking.
+   Copyright (C) 2002-2004 Free Software Foundation, Inc.
+
+   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
+   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, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+#ifndef _XVASPRINTF_H
+#define _XVASPRINTF_H
+
+/* Get va_list.  */
+#include <stdarg.h>
+
+#ifndef __attribute__
+/* This feature is available in gcc versions 2.5 and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+#  define __attribute__(Spec) /* empty */
+# endif
+/* The __-protected variants of `format' and `printf' attributes
+   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#  define __format__ format
+#  define __printf__ printf
+# endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Write formatted output to a string dynamically allocated with malloc().
+   If the memory allocation succeeds, store the address of the string in
+   *RESULT and return the number of resulting bytes, excluding the trailing
+   NUL.  Upon [ENOMEM] memory allocation error, call xalloc_die.
+   On some other error
+     - [EOVERFLOW] resulting string length is > INT_MAX,
+     - [EINVAL] invalid format string,
+     - [EILSEQ] error during conversion between wide and multibyte characters,
+   return NULL.  */
+extern char *xasprintf (const char *format, ...)
+       __attribute__ ((__format__ (__printf__, 1, 2)));
+extern char *xvasprintf (const char *format, va_list args)
+       __attribute__ ((__format__ (__printf__, 1, 0)));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _XVASPRINTF_H */

diff --git a/modules/xvasprintf b/modules/xvasprintf
new file mode 100644 (file)
index 0000000..2524095
--- /dev/null
+++ b/modules/xvasprintf
@@ -0,0 +1,21 @@
+Description:
+vasprintf and asprintf with out-of-memory checking.  Also see xalloc-die.
+
+Files:
+lib/xvasprintf.h
+lib/xvasprintf.c
+lib/xasprintf.c
+
+Depends-on:
+vasprintf
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += xvasprintf.h xvasprintf.c xasprintf.c 
+
+Include:
+"xvasprintf.h"
+
+Maintainer:
+Oskar Liljeblad