01c901a56b
Sun Dec 22 00:01:27 1996 Ulrich Drepper <drepper@cygnus.com> * inet/getnetgrent.c: Reformat copyright. * inet/getnetgrent_r.c (__internal_endnetgrent): Correct comment. (__internal_getnetgrent): Rename to __internal_getnetgrent_r as required in change nis/nss_compat/* at Thu Dec 19 14:24:50 1996. Reported by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>. * nss/nss_files/files-netgrp.c: Fix typo. * login/utmp_db.c: Comment out unused variables. * misc/tst-dirname.c: Provide prototype for main (for now). * new-malloc/mcheck-init.c: Include <mcheck.h>. * new-malloc/obstack.c: Provide real prototypes. * resolv/base64.c (b64_ntop): Use size_t as type of `i', not int. (b64_pton): Likewise for `tarindex'. * resolv/nsap_addr.c (inet_nsap_addr): Add cast to prevent warning. * stdio-common/Makefile: Add CFLAGS-vfprintf.c to prevent warning. * stdio-common/printf-parse.h: Remove definition of MIN and MAX. * stdio-common/printf-prs.c: Include <sys/param.h> to get MIN and MAX. * stdio-common/vfprintf.c: Likewise. * stdlib/gmp-impl.h: Only define MIN and MAX if not already done. * stdlib/tst-strtol.c: Don't use -2147483648 as unsigned long value. * sysdeps/generic/Makefile ($(subdir)=string): Define CFLAGS-wordcopy.c to prevent warning. * sysdeps/generic/mul_n.c (mpn_mul_n): Don't define as inline. * sysdeps/generic/wordcopy.c: De-ANSI-declfy. * sysdeps/i386/Makefile ($(subdir)=elf): Define CFLAGS-rtld.c to prevent warning. * sysdeps/i386/dl-machine.h: Correct copyright. * sysdeps/unix/closedir.c: Likewise. * sysdeps/unix/dirstream.h: Likewise. * sysdeps/unix/opendir.c: Likewise. * time/tzset.c: Add prototype for __tzset_internal. * sysdeps/gnu/utmpbits.h (enum utlogin): Comment out since the way it is supposed to work is not yet known. (struct utmp): Remove ut_login and ut_syslen field for now. Sat Dec 21 16:23:54 1996 Ulrich Drepper <drepper@cygnus.com> * time/strftime.c: Fix another bug in handling flags made it impossible to use the `-', `_', or `0' flag.
119 lines
3.6 KiB
C
119 lines
3.6 KiB
C
/* Copyright (C) 1991, 1992, 1995, 1996 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. 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)
|
|
|
|
# ifdef USE_IN_LIBIO
|
|
# define PUT(F, S, N) _IO_sputn (F, S, N)
|
|
# define PAD(Padchar) \
|
|
if (width > 0) \
|
|
done += _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);
|
|
}
|