Here comes the POSIX compatible vprintf() substitute.
2007-03-08 Bruno Haible <[EMAIL PROTECTED]>
* modules/vprintf-posix: New file.
* lib/vprintf.c: New file.
* m4/vprintf-posix.m4: New file.
* m4/stdio_h.m4 (gl_STDIO_H_DEFAULTS): Set also GNULIB_VPRINTF_POSIX,
REPLACE_VPRINTF.
* lib/stdio_.h (vprintf): New declaration.
* modules/stdio (Makefile.am): Substitute also GNULIB_VPRINTF_POSIX,
REPLACE_VPRINTF.
======================== modules/vprintf-posix ============================
Description:
POSIX compatible vprintf() function: print formatted output to standard output
Files:
lib/vprintf.c
m4/vprintf-posix.m4
m4/printf.m4
Depends-on:
stdio
vfprintf-posix
configure.ac:
gl_FUNC_VPRINTF_POSIX
gl_STDIO_MODULE_INDICATOR([vprintf-posix])
Makefile.am:
Include:
<stdio.h>
License:
LGPL
Maintainer:
Bruno Haible
=========================== lib/vprintf.c =================================
/* Formatted output to a stream.
Copyright (C) 2007 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
/* Specification. */
#include <stdio.h>
#include <stdarg.h>
/* Print formatted output to standard output.
Return string length of formatted string. On error, return a negative
value. */
int
vprintf (const char *format, va_list args)
{
return vfprintf (stdout, format, args);
}
========================= m4/vprintf-posix.m4 =============================
# vprintf-posix.m4 serial 1
dnl Copyright (C) 2007 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_DEFUN([gl_FUNC_VPRINTF_POSIX],
[
AC_REQUIRE([gl_FUNC_VFPRINTF_POSIX])
if test $gl_cv_func_vfprintf_posix = no; then
gl_REPLACE_VPRINTF
fi
])
AC_DEFUN([gl_REPLACE_VPRINTF],
[
AC_REQUIRE([gl_STDIO_H_DEFAULTS])
AC_LIBOBJ([vprintf])
REPLACE_VPRINTF=1
gl_PREREQ_VPRINTF
])
AC_DEFUN([gl_PREREQ_VPRINTF], [:])
===========================================================================
*** m4/stdio_h.m4 9 Mar 2007 02:59:39 -0000 1.7
--- m4/stdio_h.m4 9 Mar 2007 03:38:18 -0000
***************
*** 25,35 ****
--- 25,37 ----
GNULIB_SNPRINTF=0; AC_SUBST([GNULIB_SNPRINTF])
GNULIB_SPRINTF_POSIX=0; AC_SUBST([GNULIB_SPRINTF_POSIX])
GNULIB_VFPRINTF_POSIX=0; AC_SUBST([GNULIB_VFPRINTF_POSIX])
+ GNULIB_VPRINTF_POSIX=0; AC_SUBST([GNULIB_VPRINTF_POSIX])
GNULIB_VSNPRINTF=0; AC_SUBST([GNULIB_VSNPRINTF])
GNULIB_VSPRINTF_POSIX=0; AC_SUBST([GNULIB_VSPRINTF_POSIX])
dnl Assume proper GNU behavior unless another module says otherwise.
REPLACE_FPRINTF=0; AC_SUBST([REPLACE_FPRINTF])
REPLACE_VFPRINTF=0; AC_SUBST([REPLACE_VFPRINTF])
+ REPLACE_VPRINTF=0; AC_SUBST([REPLACE_VPRINTF])
REPLACE_SNPRINTF=0; AC_SUBST([REPLACE_SNPRINTF])
HAVE_DECL_SNPRINTF=1; AC_SUBST([HAVE_DECL_SNPRINTF])
REPLACE_VSNPRINTF=0; AC_SUBST([REPLACE_VSNPRINTF])
*** lib/stdio_.h 9 Mar 2007 02:59:39 -0000 1.9
--- lib/stdio_.h 9 Mar 2007 03:38:18 -0000
***************
*** 68,73 ****
--- 68,87 ----
vfprintf (s, f, a))
#endif
+ #if @GNULIB_VPRINTF_POSIX@
+ # if @REPLACE_VPRINTF@
+ # define vprintf rpl_vprintf
+ extern int vprintf (const char *format, va_list args);
+ # endif
+ #elif defined GNULIB_POSIXCHECK
+ # undef vprintf
+ # define vprintf(f,a) \
+ (GL_LINK_WARNING ("vprintf is not always POSIX compliant - " \
+ "use gnulib module vprintf-posix for portable " \
+ "POSIX compliance"), \
+ vprintf (f, a))
+ #endif
+
#if @GNULIB_SNPRINTF@
# if @REPLACE_SNPRINTF@
# define snprintf rpl_snprintf
*** modules/stdio 9 Mar 2007 02:59:39 -0000 1.7
--- modules/stdio 9 Mar 2007 03:38:18 -0000
***************
*** 25,34 ****
--- 25,36 ----
-e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
-e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
-e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
+ -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
-e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
-e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
-e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
-e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \
+ -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \
-e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
-e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \
-e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \
