mirror of
				https://sourceware.org/git/glibc.git
				synced 2025-11-03 20:53:13 +03:00 
			
		
		
		
	1998-07-28 Ulrich Drepper <drepper@cygnus.com> * math/libm-test.c (tgamma_test): Remove redundant tests. 1998-07-28 16:20 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/glob.c: Correct problems with */foo and GLOB_NOCHECK where foo does not exist in any of the subdirectories. Reported by Paul D. Smith <psmith@BayNetworks.COM>. * posix/globtest.sh: Add test for this bug. 1998-07-28 Mark Kettenis <kettenis@phys.uva.nl> * io/sys/statfs.h: Fix typos. * io/sys/statvfs.h: Fix typos. 1998-07-28 Ulrich Drepper <drepper@cygnus.com> * version.h (VERSION): Bump to 2.0.95. * math/Makefile (libm-calls): Remove w_gamma, add w_tgamma. * math/Versions [GLIBC_2.1]: Add tgamma, tgammaf, and tgammal. * math/libm-test.c: Split old gamma_test and move half of it in new function tgamma_test. * math/bits/mathcalls.h: Add declaration of tgamma. * sysdeps/libm-ieee754/k_standard.c: Change gamma errors into tgamma errors. * sysdeps/libm-ieee754/w_gamma.c: Remove lgamma compatibility code and rename to ... * sysdeps/libm-ieee754/w_tgamma.c: ... this. New file. * sysdeps/libm-ieee754/w_gammaf.c: Remove lgammaf compatibility code and rename to ... * sysdeps/libm-ieee754/w_tgammaf.c: ... this. New file. * sysdeps/libm-ieee754/w_gammal.c: Remove lgammal compatibility code and rename to ... * sysdeps/libm-ieee754/w_tgammal.c: ... this. New file. * sysdeps/libm-ieee754/w_lgamma.c: Add gamma as weak alias. * sysdeps/libm-ieee754/w_lgammaf.c: Likewise. * sysdeps/libm-ieee754/w_lgammal.c: Likewise. * stgdio-common/printf-parse.h: Implement handling of j, t, and z modifiers. * stdio-common/vfprintf.c: Likewise. * stdio-common/vfscanf.c: Likewise. * manual/stdio.texi: Document new printf/scanf modifiers. * sysdeps/unix/sysv/linux/recvmsg.c: Remove alias __recvmsg. * sysdeps/unix/sysv/linux/sendmsg.c: Remove alias __sendmsg. 1998-07-28 Thorsten Kukuk <kukuk@vt.uni-paderborn.de> * sunrpc/Makefile (routines): Add clnt_unix and svc_unix. * sunrpc/Versions: Add new *unix_create functions. * sunrpc/clnt_gen.c: Add support for RPC over AF_UNIX. * sunrpc/clnt_unix.c: New, client side of RPC over AF_UNIX. * sunrpc/key_call.c: Use RPC over AF_UNIX for communication with keyserv daemon. * sunrpc/rpc/clnt.h: Add AF_UNIX based RPC function prototypes. * sunrpc/rpc/svc.h: Likewise. * sunrpc/svc_authux.c: Copy internal auth flavor if none is given. * sunrpc/svc_tcp.c: Fix typos. * sunrpc/svc_unix.c: New, server side of AF_UNIX based RPC. * nis/Makefile: Remove currently not working cache functions. * nis/Versions: Add __nisbind_* functions for rpc.nisd. * nis/nis_call.c: Rewrite binding to a NIS+ server to reuse CLIENT handles. * nis/nis_file.c: Fix memory leaks. * nis/nis_intern.h: Move internal structs from here ... * nis/rpcsvc/nislib.h: ... to here for NIS+ server and tools. * nis/nis_lookup.c: Try at first if last client handle works. * nis/nis_table.c: Likewise. * nis/nis_checkpoint.c: Adjust __do_niscall2 parameters. * nis/nis_mkdir.c: Likewise. * nis/nis_ping.c: Likewise. * nis/nis_rmdir.c: Likewise. * nis/nis_server.c: Likewise. * nis/nis_util.c: Likewise. * nis/nis_findserv.c (__nis_findfastest): Little optimization. 1998-07-28 Andreas Jaeger <aj@arthur.rhein-neckar.de> * stdlib/strtol.c (STRTOL_LONG_MAX): Correct typo in last patch - define as LONG_MAX. 1998-07-28 09:31 Ulrich Drepper <drepper@cygnus.com> * nscd/connections.c (gr_send_answer): Deal with missing UIO_MAXIOV. Correct test whether writev send all data. * nscd/nscd_getgr_r.c (__nscd_getgr_r): Correct test whether readv received all data. 1998-07-28 Mark Kettenis <kettenis@phys.uva.nl> * nscd/nscd_getgr_r.c (__nscd_getgr_r): Deal with missing UIO_MAXIOV. 1998-07-28 Mark Kettenis <kettenis@phys.uva.nl> * sysdeps/mach/hurd/dl-sysdep.c (open_file): Change assert call to allow mode to be 0. (__xstat): New function. (__fxstat): New function. (_dl_sysdep_read_whole_file): Removed. The implementation in `elf/dl-misc.c' now also works for the Hurd.
		
			
				
	
	
		
			413 lines
		
	
	
		
			11 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			413 lines
		
	
	
		
			11 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* Internal header for parsing printf format strings.
 | 
						|
   Copyright (C) 1995, 1996, 1997, 1998 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 <stdint.h>
 | 
						|
#include <stddef.h>
 | 
						|
#include <string.h>
 | 
						|
 | 
						|
#define NDEBUG 1
 | 
						|
#include <assert.h>
 | 
						|
 | 
						|
 | 
						|
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;
 | 
						|
}
 | 
						|
 | 
						|
 | 
						|
/* These are defined in reg-printf.c.  */
 | 
						|
extern printf_arginfo_function *__printf_arginfo_table[];
 | 
						|
extern printf_function **__printf_function_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;
 | 
						|
  spec->info.is_char = 0;
 | 
						|
 | 
						|
  if (*format == L_('h') || *format == L_('l') || *format == L_('L') ||
 | 
						|
      *format == L_('Z') || *format == L_('q') || *format == L_('z') ||
 | 
						|
      *format == L_('t') || *format == L_('j'))
 | 
						|
    switch (*format++)
 | 
						|
      {
 | 
						|
      case L_('h'):
 | 
						|
	/* int's are short int's.  */
 | 
						|
	if (spec->info.is_short == 0)
 | 
						|
	  spec->info.is_short = 1;
 | 
						|
	else
 | 
						|
	  {
 | 
						|
	    spec->info.is_short = 0;
 | 
						|
	    spec->info.is_char = 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'):
 | 
						|
      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;
 | 
						|
      case L_('t'):
 | 
						|
	assert (sizeof (ptrdiff_t) <= sizeof (unsigned long long int));
 | 
						|
	spec->info.is_longlong = (sizeof (ptrdiff_t)
 | 
						|
				  > sizeof (unsigned long int));
 | 
						|
	spec->info.is_long = sizeof (ptrdiff_t) > sizeof (unsigned int);
 | 
						|
	break;
 | 
						|
      case L_('j'):
 | 
						|
	assert (sizeof (intmax_t) <= sizeof (unsigned long long int));
 | 
						|
	spec->info.is_longlong = (sizeof (intmax_t)
 | 
						|
				  > sizeof (unsigned long int));
 | 
						|
	spec->info.is_long = sizeof (intmax_t) > sizeof (unsigned int);
 | 
						|
	break;
 | 
						|
      }
 | 
						|
 | 
						|
  /* Get the format specification.  */
 | 
						|
  spec->info.spec = (wchar_t) *format++;
 | 
						|
  if (__printf_function_table != NULL
 | 
						|
      && spec->info.spec <= UCHAR_MAX
 | 
						|
      && __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 if (spec->info.is_char)
 | 
						|
	    spec->data_arg_type = PA_CHAR;
 | 
						|
	  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;
 | 
						|
      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;
 | 
						|
}
 |