mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-10 23:30:07 +00:00
9d26efa90c
New types printf_arginfo_size_function, printf_va_arg_function. Declare register_printf_specifier, register_printf_modifier, register_printf_type. * stdio-common/printf-parse.h (struct printf_spec): Add size element. (union printf_arg): Add pa_user element. Adjust __printf_arginfo_table type. Add __printf_va_arg_table, __printf_modifier_table, __handle_registered_modifier_mb, and __handle_registered_modifier_wc declarations. * stdio-common/printf-parsemb.c: Recognize registered modifiers. If registered arginfo call failed try normal specifier. * stdio-common/printf-prs.c: Pass additional parameter to arginfo function. * stdio-common/Makefile (routines): Add reg-modifier and reg-type. * stdio-common/Versions: Export register_printf_modifier, register_printf_type, and register_printf_specifier for GLIBC_2.10. * stdio-common/reg-modifier.c: New file. * stdio-common/reg-type.c: New file. * stdio-common/reg-printf.c (__register_printf_specifier): New function. Mostly the old __register_printf_function function but uses locking and type of third parameter changed. (__register_printf_function): Implement using __register_printf_specifier. * stdio-common/vfprintf.c (vfprintf): Collect argument sizes in calls to arginfo functions. Allocate enough memory for user-defined types. Call new va_arg functions to get user-defined types. Try installed handlers even for existing format specifiers first.
92 lines
2.7 KiB
C
92 lines
2.7 KiB
C
/* Copyright (C) 1991,1996,1997,2002-2004,2009 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.
|
|
|
|
The GNU C 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 the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <printf.h>
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <bits/libc-lock.h>
|
|
|
|
|
|
/* Array of functions indexed by format character. */
|
|
libc_freeres_ptr (printf_arginfo_size_function **__printf_arginfo_table)
|
|
attribute_hidden;
|
|
printf_function **__printf_function_table attribute_hidden;
|
|
|
|
__libc_lock_define_initialized (static, lock)
|
|
|
|
int __register_printf_specifier (int, printf_function,
|
|
printf_arginfo_size_function);
|
|
int __register_printf_function (int, printf_function,
|
|
printf_arginfo_function);
|
|
|
|
|
|
/* Register FUNC to be called to format SPEC specifiers. */
|
|
int
|
|
__register_printf_specifier (spec, converter, arginfo)
|
|
int spec;
|
|
printf_function converter;
|
|
printf_arginfo_size_function arginfo;
|
|
{
|
|
if (spec < 0 || spec > (int) UCHAR_MAX)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
|
|
int result = 0;
|
|
__libc_lock_lock (lock);
|
|
|
|
if (__printf_function_table == NULL)
|
|
{
|
|
__printf_arginfo_table = (printf_arginfo_size_function **)
|
|
calloc (UCHAR_MAX + 1, sizeof (void *) * 2);
|
|
if (__printf_arginfo_table == NULL)
|
|
{
|
|
result = -1;
|
|
goto out;
|
|
}
|
|
|
|
__printf_function_table = (printf_function **)
|
|
(__printf_arginfo_table + UCHAR_MAX + 1);
|
|
}
|
|
|
|
__printf_function_table[spec] = converter;
|
|
__printf_arginfo_table[spec] = arginfo;
|
|
|
|
out:
|
|
__libc_lock_unlock (lock);
|
|
|
|
return result;
|
|
}
|
|
weak_alias (__register_printf_specifier, register_printf_specifier)
|
|
|
|
|
|
/* Register FUNC to be called to format SPEC specifiers. */
|
|
int
|
|
__register_printf_function (spec, converter, arginfo)
|
|
int spec;
|
|
printf_function converter;
|
|
printf_arginfo_function arginfo;
|
|
{
|
|
return __register_printf_specifier (spec, converter,
|
|
(printf_arginfo_size_function*) arginfo);
|
|
}
|
|
weak_alias (__register_printf_function, register_printf_function)
|