mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-26 05:56:14 +01:00
9a76ff17c1
2003-10-05 Matthias Clasen <maclas@gmx.de> * configure.in: Make the various printf feature test macros reflect the system printf, even when using the included printf. In particular, don't force HAVE_C99_SNPRINTF, since g-gnulib.h needs that test result. (#122973) * glib/gprintf.c (g_vasprintf): Don't rely on HAVE_VASPRINTF, directly check for _g_vasprintf. * glib/gprintfint.h (_g_vasprintf): Only define _g_vasprintf() if vasprintf() is available. * glib/gnulib/printf.c (_g_gnulib_vfprintf): Don't write trailing nul to the file. (#122973) * acinclude.m4 (AC_FUNC_VSNPRINTF_C99): Make the test detect non-C99-compliance of AIX 5.1 and Solaris vsnprintf(). (#122496)
155 lines
3.3 KiB
C
155 lines
3.3 KiB
C
/* GLIB - Library of useful routines for C programming
|
|
* Copyright (C) 2003 Matthias Clasen
|
|
*
|
|
* This 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 of the License, or (at your option) any later version.
|
|
*
|
|
* This 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 this library; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/*
|
|
* Modified by the GLib Team and others 2003. See the AUTHORS
|
|
* file for a list of people on the GLib Team. See the ChangeLog
|
|
* files for a list of changes. These files are distributed with
|
|
* GLib at ftp://ftp.gtk.org/pub/gtk/.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include "g-gnulib.h"
|
|
#include "vasnprintf.h"
|
|
#include "printf.h"
|
|
|
|
int _g_gnulib_printf (char const *format, ...)
|
|
{
|
|
va_list args;
|
|
int retval;
|
|
|
|
va_start (args, format);
|
|
retval = _g_gnulib_vprintf (format, args);
|
|
va_end (args);
|
|
|
|
return retval;
|
|
}
|
|
|
|
int _g_gnulib_fprintf (FILE *file, char const *format, ...)
|
|
{
|
|
va_list args;
|
|
int retval;
|
|
|
|
va_start (args, format);
|
|
retval = _g_gnulib_vfprintf (file, format, args);
|
|
va_end (args);
|
|
|
|
return retval;
|
|
}
|
|
|
|
int _g_gnulib_sprintf (char *string, char const *format, ...)
|
|
{
|
|
va_list args;
|
|
int retval;
|
|
|
|
va_start (args, format);
|
|
retval = _g_gnulib_vsprintf (string, format, args);
|
|
va_end (args);
|
|
|
|
return retval;
|
|
}
|
|
|
|
int _g_gnulib_snprintf (char *string, size_t n, char const *format, ...)
|
|
{
|
|
va_list args;
|
|
int retval;
|
|
|
|
va_start (args, format);
|
|
retval = _g_gnulib_vsnprintf (string, n, format, args);
|
|
va_end (args);
|
|
|
|
return retval;
|
|
}
|
|
|
|
int _g_gnulib_vprintf (char const *format, va_list args)
|
|
{
|
|
return _g_gnulib_vfprintf (stdout, format, args);
|
|
}
|
|
|
|
int _g_gnulib_vfprintf (FILE *file, char const *format, va_list args)
|
|
{
|
|
char *result;
|
|
size_t length;
|
|
|
|
result = vasnprintf (NULL, &length, format, args);
|
|
if (result == NULL)
|
|
return -1;
|
|
|
|
fwrite (result, 1, length, file);
|
|
free (result);
|
|
|
|
return length;
|
|
}
|
|
|
|
int _g_gnulib_vsprintf (char *string, char const *format, va_list args)
|
|
{
|
|
char *result;
|
|
size_t length;
|
|
|
|
result = vasnprintf (NULL, &length, format, args);
|
|
if (result == NULL)
|
|
return -1;
|
|
|
|
memcpy (string, result, length + 1);
|
|
free (result);
|
|
|
|
return length;
|
|
}
|
|
|
|
int _g_gnulib_vsnprintf (char *string, size_t n, char const *format, va_list args)
|
|
{
|
|
char *result;
|
|
size_t length;
|
|
|
|
result = vasnprintf (NULL, &length, format, args);
|
|
if (result == NULL)
|
|
return -1;
|
|
|
|
if (n > 0)
|
|
{
|
|
memcpy (string, result, MIN(length + 1, n));
|
|
string[n - 1] = 0;
|
|
}
|
|
|
|
free (result);
|
|
|
|
return length;
|
|
}
|
|
|
|
int _g_gnulib_vasprintf (char **result, char const *format, va_list args)
|
|
{
|
|
size_t length;
|
|
|
|
*result = vasnprintf (NULL, &length, format, args);
|
|
if (*result == NULL)
|
|
return -1;
|
|
|
|
return length;
|
|
}
|
|
|
|
|
|
|
|
|
|
|