mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-06 20:58:33 +01:00
Sun Dec 15 01:53:20 1996 Ulrich Drepper <drepper@cygnus.com> * Makefile (subdirs): Change crypt to md5-crypt. * crypt/Makefile, crypt/md5-crypt.c, crypt/md5.c, crypt/md5.h, crypt/md5c-test.c, crypt/md5test.c: Move to new directory md5-crypt. * sysdeps/unix/sysv/linux/configure.in: Refer to linuxthreads and crypt instead of LinuxThreads and des-crypt. * Makefile (subdirs): Add nss back. * sysdeps/unix/inet/Subdirs: Move nis to end of file to fulfill dependencies. * libio/iofclose.c: Implement fclose(NULL) as closing all streams. * stdio-common/Makefile (routines): Add fcloseall. * stdio-common/fcloseall.c: New file. * sysdeps/generic/abort.c: Make implementation POSIX.1 compatible. * sysdeps/mach/libc-lock.h: Add definition of __libc_lock_trylock. * sysdeps/stub/libc-lock.h: Define __libc_lock_trylock to always return 0. * stdio-common/printf.h: Define MIN and MAX only if not already defined. * stdio-common/vfprintf.c: Set errno to EBADF if stream does not allow writing. Required by POSIX.1. * libio/libioP.h (CHECK_FILE): Use MAYBE_SET_EINVAL instead of assignment. * interp.c: Update copyright. * libio/clearerr.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * stdio/fclose.c: Likewise. * stdio/fflus.c: Likewise. * libio/libio.h [!_IO_MTSAFE_IO]: Define _IO_cleanup_region_start and _IO_cleanup_region_end as empty. * libio/fgetc.c: Use _IO_cleanup_region_start and _IO_cleanup_region_end instead of __libc_cleanup_region_start and __libc_cleanup_region_end. * libio/fputc.c: Likewise. * libio/freopen.c: Likewise. * libio/fseek.c: Likewise. * libio/getc.c: Likewise. * libio/getchar.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetdelim.c: Likewise. * libio/iogets.c: Likewise. * libio/ioputs.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/iovspintf.c: Use cleanup handler to make sure no dangling locks can stay over. * libio/iovsscanf.c: Likewise. * libio/genops.c: Use _IO_lock_init_recursive and _IO_lock_fini instead of __libc_lock_init_recursive and __libc_lock_fini. * libio/filedoalloc.c: Only use __isatty when compiling GNU libc. Otherwise use isatty. * libio/fileops.c: Likewise for __open and open. * login/utmp_file.c (getutent_r_file): Use fcntl instead of flock. * nis/ypclnt.h: Add more casts to prevent warnings. * nss/Makefile (services): Remove dns. (libnss_dns, libnss_dns-inhibit-o): Remove definition. ($(objpfx)libnss_dns.so): Removed. * nss/nss_dns/dns-host.c, nss/nss_dns/dns-network.c: Moved to... * resolv/nss_dns: ...here. * resolv/Makefile (extra-libs): Add libnss_dns. (libnss_dns-routines, libnss_dns-inhibit-o): Define as in nss/Makefile. * nss/XXX-lookup.c: Call __nss_database_lookup with new argument specifying alternate name for entry in /etc/nsswitch.conf * nss/nsswitch.c: If no entry with primary name is found in /etc/nsswitch.conf try alternate name if given. * nss/nsswitch.h: Add new parameter in prototype for __nss_database_lookup. * nss/spwd-lookup.c: Provide alternative entry name to look for. This makes our NSS compatible with Solaris' nsswitch.conf files. * string/tst-strlen.c: Change all counting variables to type size_t to prevent warnings. * sysdeps/posix/fpathconf.c: Update copyright. * sysdeps/posix/pathconf.c: Don't call fpathconf to do the work. Opening the file at this path may fail if it is a FIFO or pipe. These changes make the time implementation POSIX.1 compliant. * time/localtime.c (__localtime_r): Always call __tzset not only if __tzset_run is zero. * time/strftime.c: Add definition of memset_space to help to reduce for systems which have memset. (strftime): Don't use tm_zone member of argument for zone name. Instead always use tzname[]. Call tzset() as required by POSIX.1 before any action. * time/tzset.c (tzset): Set tzname[] as required by POSIX.1. Remove global variable __tzset_run. __tzset is now called always when a dependent function is used. (__tzset): Caching happens based on the contents of the environment variable TZ. Fri Dec 13 01:06:52 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/paths.h: Add _PATH_KLOG. Thu Dec 12 09:16:35 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * rellns-sh: Correctly handle a relative source file name. Wed Dec 11 19:18:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * login/utmp_file.c (setutent_file): Seek back to beginning of the file if resetting. Thu Dec 12 16:39:12 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * hurd/hurdinit.c (map0): Delete function. Don't do this on _hurd_preinit_hook. * hurd/hurdstartup.c (_hurd_startup): Map page zero redzone here.
395 lines
10 KiB
C
395 lines
10 KiB
C
/* Internal header for parsing printf format strings.
|
|
Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
|
This file is part of th 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 <ctype.h>
|
|
#include <printf.h>
|
|
#include <string.h>
|
|
#include <stddef.h>
|
|
|
|
#define NDEBUG 1
|
|
#include <assert.h>
|
|
|
|
#ifndef MAX
|
|
#define MAX(a,b) ({typeof(a) _a = (a); typeof(b) _b = (b); \
|
|
_a > _b ? _a : _b; })
|
|
#endif
|
|
#ifndef MIN
|
|
#define MIN(a,b) ({typeof(a) _a = (a); typeof(b) _b = (b); \
|
|
_a < _b ? _a : _b; })
|
|
#endif
|
|
|
|
struct printf_spec
|
|
{
|
|
/* Information parsed from the format spec. */
|
|
struct printf_info info;
|
|
|
|
/* Pointers into the format string for the end of this format
|
|
spec and the next (or to the end of the string if no more). */
|
|
const char *end_of_fmt, *next_fmt;
|
|
|
|
/* Position of arguments for precision and width, or -1 if `info' has
|
|
the constant value. */
|
|
int prec_arg, width_arg;
|
|
|
|
int data_arg; /* Position of data argument. */
|
|
int data_arg_type; /* Type of first argument. */
|
|
/* Number of arguments consumed by this format specifier. */
|
|
size_t ndata_args;
|
|
};
|
|
|
|
|
|
/* The various kinds off arguments that can be passed to printf. */
|
|
union printf_arg
|
|
{
|
|
unsigned char pa_char;
|
|
wchar_t pa_wchar;
|
|
short int pa_short_int;
|
|
int pa_int;
|
|
long int pa_long_int;
|
|
long long int pa_long_long_int;
|
|
unsigned short int pa_u_short_int;
|
|
unsigned int pa_u_int;
|
|
unsigned long int pa_u_long_int;
|
|
unsigned long long int pa_u_long_long_int;
|
|
float pa_float;
|
|
double pa_double;
|
|
long double pa_long_double;
|
|
const char *pa_string;
|
|
const wchar_t *pa_wstring;
|
|
void *pa_pointer;
|
|
};
|
|
|
|
|
|
/* Read a simple integer from a string and update the string pointer.
|
|
It is assumed that the first character is a digit. */
|
|
static inline unsigned int
|
|
read_int (const UCHAR_T * *pstr)
|
|
{
|
|
unsigned int retval = **pstr - L_('0');
|
|
|
|
while (ISDIGIT (*++(*pstr)))
|
|
{
|
|
retval *= 10;
|
|
retval += **pstr - L_('0');
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
|
|
|
|
/* Find the next spec in FORMAT, or the end of the string. Returns
|
|
a pointer into FORMAT, to a '%' or a '\0'. */
|
|
static inline const char *
|
|
find_spec (const char *format, mbstate_t *ps)
|
|
{
|
|
while (*format != '\0' && *format != '%')
|
|
{
|
|
int len;
|
|
|
|
/* Remove any hints of a wrong encoding. */
|
|
ps->count = 0;
|
|
if (isascii (*format) || (len = mbrlen (format, MB_CUR_MAX, ps)) <= 0)
|
|
++format;
|
|
else
|
|
format += len;
|
|
}
|
|
return format;
|
|
}
|
|
|
|
|
|
/* This is defined in reg-printf.c. */
|
|
extern printf_arginfo_function **__printf_arginfo_table;
|
|
|
|
|
|
/* FORMAT must point to a '%' at the beginning of a spec. Fills in *SPEC
|
|
with the parsed details. POSN is the number of arguments already
|
|
consumed. At most MAXTYPES - POSN types are filled in TYPES. Return
|
|
the number of args consumed by this spec; *MAX_REF_ARG is updated so it
|
|
remains the highest argument index used. */
|
|
static inline size_t
|
|
parse_one_spec (const UCHAR_T *format, size_t posn, struct printf_spec *spec,
|
|
size_t *max_ref_arg, mbstate_t *ps)
|
|
{
|
|
unsigned int n;
|
|
size_t nargs = 0;
|
|
|
|
/* Skip the '%'. */
|
|
++format;
|
|
|
|
/* Clear information structure. */
|
|
spec->data_arg = -1;
|
|
spec->info.alt = 0;
|
|
spec->info.space = 0;
|
|
spec->info.left = 0;
|
|
spec->info.showsign = 0;
|
|
spec->info.group = 0;
|
|
spec->info.pad = ' ';
|
|
|
|
/* Test for positional argument. */
|
|
if (ISDIGIT (*format))
|
|
{
|
|
const UCHAR_T *begin = format;
|
|
|
|
n = read_int (&format);
|
|
|
|
if (n > 0 && *format == L_('$'))
|
|
/* Is positional parameter. */
|
|
{
|
|
++format; /* Skip the '$'. */
|
|
spec->data_arg = n - 1;
|
|
*max_ref_arg = MAX (*max_ref_arg, n);
|
|
}
|
|
else
|
|
/* Oops; that was actually the width and/or 0 padding flag.
|
|
Step back and read it again. */
|
|
format = begin;
|
|
}
|
|
|
|
/* Check for spec modifiers. */
|
|
while (*format == L_(' ') || *format == L_('+') || *format == L_('-') ||
|
|
*format == L_('#') || *format == L_('0') || *format == L_('\''))
|
|
switch (*format++)
|
|
{
|
|
case L_(' '):
|
|
/* Output a space in place of a sign, when there is no sign. */
|
|
spec->info.space = 1;
|
|
break;
|
|
case L_('+'):
|
|
/* Always output + or - for numbers. */
|
|
spec->info.showsign = 1;
|
|
break;
|
|
case L_('-'):
|
|
/* Left-justify things. */
|
|
spec->info.left = 1;
|
|
break;
|
|
case L_('#'):
|
|
/* Use the "alternate form":
|
|
Hex has 0x or 0X, FP always has a decimal point. */
|
|
spec->info.alt = 1;
|
|
break;
|
|
case L_('0'):
|
|
/* Pad with 0s. */
|
|
spec->info.pad = '0';
|
|
break;
|
|
case L_('\''):
|
|
/* Show grouping in numbers if the locale information
|
|
indicates any. */
|
|
spec->info.group = 1;
|
|
break;
|
|
}
|
|
if (spec->info.left)
|
|
spec->info.pad = ' ';
|
|
|
|
/* Get the field width. */
|
|
spec->width_arg = -1;
|
|
spec->info.width = 0;
|
|
if (*format == L_('*'))
|
|
{
|
|
/* The field width is given in an argument.
|
|
A negative field width indicates left justification. */
|
|
const UCHAR_T *begin = ++format;
|
|
|
|
if (ISDIGIT (*format))
|
|
{
|
|
/* The width argument might be found in a positional parameter. */
|
|
n = read_int (&format);
|
|
|
|
if (n > 0 && *format == L_('$'))
|
|
{
|
|
spec->width_arg = n - 1;
|
|
*max_ref_arg = MAX (*max_ref_arg, n);
|
|
++format; /* Skip '$'. */
|
|
}
|
|
}
|
|
|
|
if (spec->width_arg < 0)
|
|
{
|
|
/* Not in a positional parameter. Consume one argument. */
|
|
spec->width_arg = posn++;
|
|
++nargs;
|
|
format = begin; /* Step back and reread. */
|
|
}
|
|
}
|
|
else if (ISDIGIT (*format))
|
|
/* Constant width specification. */
|
|
spec->info.width = read_int (&format);
|
|
|
|
/* Get the precision. */
|
|
spec->prec_arg = -1;
|
|
/* -1 means none given; 0 means explicit 0. */
|
|
spec->info.prec = -1;
|
|
if (*format == L_('.'))
|
|
{
|
|
++format;
|
|
if (*format == L_('*'))
|
|
{
|
|
/* The precision is given in an argument. */
|
|
const UCHAR_T *begin = ++format;
|
|
|
|
if (ISDIGIT (*format))
|
|
{
|
|
n = read_int (&format);
|
|
|
|
if (n > 0 && *format == L_('$'))
|
|
{
|
|
spec->prec_arg = n - 1;
|
|
*max_ref_arg = MAX (*max_ref_arg, n);
|
|
++format;
|
|
}
|
|
}
|
|
|
|
if (spec->prec_arg < 0)
|
|
{
|
|
/* Not in a positional parameter. */
|
|
spec->prec_arg = posn++;
|
|
++nargs;
|
|
format = begin;
|
|
}
|
|
}
|
|
else if (ISDIGIT (*format))
|
|
spec->info.prec = read_int (&format);
|
|
else
|
|
/* "%.?" is treated like "%.0?". */
|
|
spec->info.prec = 0;
|
|
}
|
|
|
|
/* Check for type modifiers. */
|
|
#define is_longlong is_long_double
|
|
spec->info.is_long_double = 0;
|
|
spec->info.is_short = 0;
|
|
spec->info.is_long = 0;
|
|
|
|
if (*format == L_('h') || *format == L_('l') || *format == L_('L') ||
|
|
*format == L_('Z') || *format == L_('q'))
|
|
switch (*format++)
|
|
{
|
|
case L_('h'):
|
|
/* int's are short int's. */
|
|
spec->info.is_short = 1;
|
|
break;
|
|
case L_('l'):
|
|
/* int's are long int's. */
|
|
spec->info.is_long = 1;
|
|
if (*format != L_('l'))
|
|
break;
|
|
++format;
|
|
/* FALLTHROUGH */
|
|
case L_('L'):
|
|
/* double's are long double's, and int's are long long int's. */
|
|
case L_('q'):
|
|
/* 4.4 uses this for long long. */
|
|
spec->info.is_long_double = 1;
|
|
break;
|
|
case L_('Z'):
|
|
/* int's are size_t's. */
|
|
assert (sizeof(size_t) <= sizeof(unsigned long long int));
|
|
spec->info.is_longlong = sizeof(size_t) > sizeof(unsigned long int);
|
|
spec->info.is_long = sizeof(size_t) > sizeof(unsigned int);
|
|
break;
|
|
}
|
|
|
|
/* Get the format specification. */
|
|
spec->info.spec = (wchar_t) *format++;
|
|
if (__printf_arginfo_table != NULL &&
|
|
__printf_arginfo_table[spec->info.spec] != NULL)
|
|
/* We don't try to get the types for all arguments if the format
|
|
uses more than one. The normal case is covered though. */
|
|
spec->ndata_args = (*__printf_arginfo_table[spec->info.spec])
|
|
(&spec->info, 1, &spec->data_arg_type);
|
|
else
|
|
{
|
|
/* Find the data argument types of a built-in spec. */
|
|
spec->ndata_args = 1;
|
|
|
|
switch (spec->info.spec)
|
|
{
|
|
case L'i':
|
|
case L'd':
|
|
case L'u':
|
|
case L'o':
|
|
case L'X':
|
|
case L'x':
|
|
if (spec->info.is_longlong)
|
|
spec->data_arg_type = PA_INT|PA_FLAG_LONG_LONG;
|
|
else if (spec->info.is_long)
|
|
spec->data_arg_type = PA_INT|PA_FLAG_LONG;
|
|
else if (spec->info.is_short)
|
|
spec->data_arg_type = PA_INT|PA_FLAG_SHORT;
|
|
else
|
|
spec->data_arg_type = PA_INT;
|
|
break;
|
|
case L'e':
|
|
case L'E':
|
|
case L'f':
|
|
case L'g':
|
|
case L'G':
|
|
if (spec->info.is_long_double)
|
|
spec->data_arg_type = PA_DOUBLE|PA_FLAG_LONG_DOUBLE;
|
|
else
|
|
spec->data_arg_type = PA_DOUBLE;
|
|
break;
|
|
case L'c':
|
|
spec->data_arg_type = PA_CHAR;
|
|
break;
|
|
case L'C':
|
|
spec->data_arg_type = PA_WCHAR;
|
|
break;
|
|
case L's':
|
|
spec->data_arg_type = PA_STRING;
|
|
break;
|
|
case L'S':
|
|
spec->data_arg_type = PA_WSTRING;
|
|
break;
|
|
case L'p':
|
|
spec->data_arg_type = PA_POINTER;
|
|
break;
|
|
case L'n':
|
|
spec->data_arg_type = PA_INT|PA_FLAG_PTR;
|
|
break;
|
|
|
|
case L'm':
|
|
default:
|
|
/* An unknown spec will consume no args. */
|
|
spec->ndata_args = 0;
|
|
break;
|
|
}
|
|
|
|
if (spec->data_arg == -1 && spec->ndata_args > 0)
|
|
{
|
|
/* There are args consumed, but no positional spec.
|
|
Use the next sequential arg position. */
|
|
spec->data_arg = posn;
|
|
posn += spec->ndata_args;
|
|
nargs += spec->ndata_args;
|
|
}
|
|
}
|
|
|
|
if (spec->info.spec == L'\0')
|
|
/* Format ended before this spec was complete. */
|
|
spec->end_of_fmt = spec->next_fmt = format - 1;
|
|
else
|
|
{
|
|
/* Find the next format spec. */
|
|
spec->end_of_fmt = format;
|
|
spec->next_fmt = find_spec (format, ps);
|
|
}
|
|
|
|
return nargs;
|
|
}
|