77fe0b9cd8
2002-02-25 Ulrich Drepper <drepper@redhat.com> * assert/assert-perr.c: Use INTUSE to reference functions and variables inside libc itself. Ise INTDEF and INTDEF2 to define appropriate aliases. Add prototypes for the new aliases. * assert/assert.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * include/netinet/in.h: Likewise. * include/rpc/auth.h: Likewise. * include/rpc/auth_unix.h: Likewise. * include/rpc/key_prot.h: Likewise. * include/rpc/pmap_prot.h: Likewise. * include/rpc/pmap_rmt.h: Likewise. * include/rpc/rpc_msg.h: Likewise. * include/rpc/xdr.h: Likewise. * inet/gethstbyad_r.c: Likewise. * inet/gethstbynm2_r.c: Likewise. * inet/gethstbynm_r.c: Likewise. * inet/gethstent_r.c: Likewise. * inet/in6_addr.c: Likewise. * libio/__fpurge.c: Likewise. * libio/filedoalloc.c: Likewise. * libio/fileops.c: Likewise. * libio/ftello.c: Likewise. * libio/ftello64.c: Likewise. * libio/genops.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofdopen.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofflush_u.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgetpos64.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofgets_u.c: Likewise. * libio/iofopen.c: Likewise. * libio/iofopncook.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofread_u.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/iofsetpos64.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetline.c: Likewise. * libio/iogets.c: Likewise. * libio/iogetwline.c: Likewise. * libio/iolibio.h: Likewise. * libio/iopadn.c: Likewise. * libio/iopopen.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/ioungetwc.c: Likewise. * libio/iovdprintf.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/libioP.h: Likewise. * libio/memstream.c: Likewise. * libio/obprintf.c: Likewise. * libio/oldfileops.c: Likewise. * libio/oldiofclose.c: Likewise. * libio/oldiofdopen.c: Likewise. * libio/oldiofgetpos.c: Likewise. * libio/oldiofgetpos64.c: Likewise. * libio/oldiofopen.c: Likewise. * libio/oldiofsetpos.c: Likewise. * libio/oldiofsetpos64.c: Likewise. * libio/oldiopopen.c: Likewise. * libio/oldstdfiles.c: Likewise. * libio/putc.c: Likewise. * libio/setbuf.c: Likewise. * libio/setlinebuf.c: Likewise. * libio/stdfiles.c: Likewise. * libio/stdio.c: Likewise. * libio/strops.c: Likewise. * libio/vasprintf.c: Likewise. * libio/vscanf.c: Likewise. * libio/vsnprintf.c: Likewise. * libio/vswprintf.c: Likewise. * libio/wfiledoalloc.c: Likewise. * libio/wfileops.c: Likewise. * libio/wgenops.c: Likewise. * libio/wstrops.c: Likewise. * malloc/mtrace.c: Likewise. * misc/error.c: Likewise. * misc/syslog.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent_r.c: Likewise. * nss/hosts-lookup.c: Likewise. * stdio-common/getw.c * stdio-common/printf-prs.c: Likewise. * stdio-common/printf_fp.c: Likewise. * stdio-common/printf_size.c: Likewise. * stdio-common/putw.c: Likewise. * stdio-common/scanf.c: Likewise. * stdio-common/sprintf.c: Likewise. * stdio-common/tmpfile64.c: Likewise. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * stdlib/strfmon.c: Likewise. * sunrpc/auth_des.c: Likewise. * sunrpc/auth_none.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/authdes_prot.c: Likewise. * sunrpc/authuxprot.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/clnt_unix.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/key_prot.c: Likewise. * sunrpc/openchild.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pm_getport.c: Likewise. * sunrpc/pmap_clnt.c: Likewise. * sunrpc/pmap_prot.c: Likewise. * sunrpc/pmap_prot2.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/rpc_cmsg.c: Likewise. * sunrpc/rpc_prot.c: Likewise. * sunrpc/svc_authux.c: Likewise. * sunrpc/svc_raw.c: Likewise. * sunrpc/svc_simple.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svc_unix.c: Likewise. * sunrpc/xdr.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_mem.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sysdeps/generic/_strerror.c: Likewise. * sysdeps/generic/printf_fphex.c: Likewise. * sysdeps/generic/tmpfile.c: Likewise. * sysdeps/gnu/errlist.awk: Likewise. * sysdeps/gnu/errlist.c: Likewise. * libio/Makefile (routines): Remove iosprint. * libio/iosprintf.c: Removed
121 lines
3.7 KiB
C
121 lines
3.7 KiB
C
/* Copyright (C) 1991,92,95,96,99,2000,2002 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 <stdio.h>
|
|
#include <printf.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <wchar.h>
|
|
#include <sys/param.h>
|
|
|
|
#ifndef COMPILE_WPRINTF
|
|
# define CHAR_T char
|
|
# define UCHAR_T unsigned char
|
|
# define INT_T int
|
|
# define L_(Str) Str
|
|
# define ISDIGIT(Ch) isdigit (Ch)
|
|
# define ISASCII(Ch) isascii (Ch)
|
|
# define MBRLEN(Cp, L, St) __mbrlen (Cp, L, St)
|
|
|
|
# ifdef USE_IN_LIBIO
|
|
# define PUT(F, S, N) _IO_sputn (F, S, N)
|
|
# define PAD(Padchar) \
|
|
if (width > 0) \
|
|
done += INTUSE(_IO_padn) (s, Padchar, width)
|
|
# else
|
|
# define PUTC(C, F) putc (C, F)
|
|
ssize_t __printf_pad __P ((FILE *, char pad, size_t n));
|
|
# define PAD(Padchar) \
|
|
if (width > 0) \
|
|
{ if (__printf_pad (s, Padchar, width) == -1) \
|
|
return -1; else done += width; }
|
|
# endif
|
|
#else
|
|
# define vfprintf vfwprintf
|
|
# define CHAR_T wchar_t
|
|
# define UCHAR_T uwchar_t
|
|
# define INT_T wint_t
|
|
# define L_(Str) L##Str
|
|
# define ISDIGIT(Ch) iswdigit (Ch)
|
|
|
|
# ifdef USE_IN_LIBIO
|
|
# define PUT(F, S, N) _IO_sputn (F, S, N)
|
|
# define PAD(Padchar) \
|
|
if (width > 0) \
|
|
done += _IO_wpadn (s, Padchar, width)
|
|
# else
|
|
# define PUTC(C, F) wputc (C, F)
|
|
ssize_t __wprintf_pad __P ((FILE *, wchar_t pad, size_t n));
|
|
# define PAD(Padchar) \
|
|
if (width > 0) \
|
|
{ if (__wprintf_pad (s, Padchar, width) == -1) \
|
|
return -1; else done += width; }
|
|
# endif
|
|
#endif
|
|
|
|
#include "printf-parse.h"
|
|
|
|
|
|
size_t
|
|
parse_printf_format (fmt, n, argtypes)
|
|
const char *fmt;
|
|
size_t n;
|
|
int *argtypes;
|
|
{
|
|
size_t nargs; /* Number of arguments. */
|
|
size_t max_ref_arg; /* Highest index used in a positional arg. */
|
|
struct printf_spec spec;
|
|
mbstate_t mbstate;
|
|
|
|
nargs = 0;
|
|
max_ref_arg = 0;
|
|
|
|
/* Search for format specifications. */
|
|
for (fmt = find_spec (fmt, &mbstate); *fmt != '\0'; fmt = spec.next_fmt)
|
|
{
|
|
/* Parse this spec. */
|
|
nargs += parse_one_spec (fmt, nargs, &spec, &max_ref_arg, &mbstate);
|
|
|
|
/* If the width is determined by an argument this is an int. */
|
|
if (spec.width_arg != -1 && (size_t) spec.width_arg < n)
|
|
argtypes[spec.width_arg] = PA_INT;
|
|
|
|
/* If the precision is determined by an argument this is an int. */
|
|
if (spec.prec_arg != -1 && (size_t) spec.prec_arg < n)
|
|
argtypes[spec.prec_arg] = PA_INT;
|
|
|
|
if ((size_t) spec.data_arg < n)
|
|
switch (spec.ndata_args)
|
|
{
|
|
case 0: /* No arguments. */
|
|
break;
|
|
case 1: /* One argument; we already have the type. */
|
|
argtypes[spec.data_arg] = spec.data_arg_type;
|
|
break;
|
|
default:
|
|
/* We have more than one argument for this format spec. We must
|
|
call the arginfo function again to determine all the types. */
|
|
(void) (*__printf_arginfo_table[spec.info.spec])
|
|
(&spec.info, n - spec.data_arg, &argtypes[spec.data_arg]);
|
|
break;
|
|
}
|
|
}
|
|
|
|
return MAX (nargs, max_ref_arg);
|
|
}
|