1996-01-19 18:43:03 +00:00
|
|
|
|
/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
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
|
1996-04-03 16:31:49 +00:00
|
|
|
|
not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
Boston, MA 02111-1307, USA. */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <limits.h>
|
1995-03-24 07:44:08 +00:00
|
|
|
|
#include <printf.h>
|
1995-02-18 01:27:10 +00:00
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
#include <stdlib.h>
|
1996-04-24 09:03:11 +00:00
|
|
|
|
#include <errno.h>
|
1996-04-03 16:31:49 +00:00
|
|
|
|
#include <wchar.h>
|
1995-02-18 01:27:10 +00:00
|
|
|
|
#include "_itoa.h"
|
1995-03-24 07:44:08 +00:00
|
|
|
|
#include "../locale/localeinfo.h"
|
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* This code is shared between the standard stdio implementation found
|
|
|
|
|
in GNU C library and the libio implementation originally found in
|
|
|
|
|
GNU libg++.
|
|
|
|
|
|
|
|
|
|
Beside this it is also shared between the normal and wide character
|
|
|
|
|
implementation as defined in ISO/IEC 9899:1990/Amendment 1:1995. */
|
|
|
|
|
|
|
|
|
|
#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
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 00:37:21 +00:00
|
|
|
|
# define PUT(F, S, N) _IO_sputn (F, S, N)
|
|
|
|
|
# define PAD(Padchar) \
|
1996-04-03 16:31:49 +00:00
|
|
|
|
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));
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 00:37:21 +00:00
|
|
|
|
# define PAD(Padchar) \
|
1996-04-03 16:31:49 +00:00
|
|
|
|
if (width > 0) \
|
|
|
|
|
{ if (__wprintf_pad (s, Padchar, width) == -1) \
|
|
|
|
|
return -1; else done += width; }
|
|
|
|
|
# endif
|
|
|
|
|
#endif
|
|
|
|
|
|
1995-03-24 07:44:08 +00:00
|
|
|
|
/* Include the shared code for parsing the format string. */
|
|
|
|
|
#include "printf-parse.h"
|
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
#ifdef USE_IN_LIBIO
|
|
|
|
|
/* This code is for use in libio. */
|
1996-04-03 16:31:49 +00:00
|
|
|
|
# include <libioP.h>
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 00:37:21 +00:00
|
|
|
|
# define PUTC(C, F) _IO_putc_unlocked (C, F)
|
1996-04-03 16:31:49 +00:00
|
|
|
|
# define vfprintf _IO_vfprintf
|
|
|
|
|
# define size_t _IO_size_t
|
|
|
|
|
# define FILE _IO_FILE
|
|
|
|
|
# define va_list _IO_va_list
|
|
|
|
|
# undef BUFSIZ
|
|
|
|
|
# define BUFSIZ _IO_BUFSIZ
|
|
|
|
|
# define ARGCHECK(S, Format) \
|
1995-02-18 01:27:10 +00:00
|
|
|
|
do \
|
|
|
|
|
{ \
|
|
|
|
|
/* Check file argument for consistence. */ \
|
1996-04-03 16:31:49 +00:00
|
|
|
|
CHECK_FILE (S, -1); \
|
|
|
|
|
if (S->_flags & _IO_NO_WRITES || Format == NULL) \
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{ \
|
|
|
|
|
MAYBE_SET_EINVAL; \
|
|
|
|
|
return -1; \
|
|
|
|
|
} \
|
|
|
|
|
} while (0)
|
1996-04-03 16:31:49 +00:00
|
|
|
|
# define UNBUFFERED_P(S) ((S)->_IO_file_flags & _IO_UNBUFFERED)
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 00:37:21 +00:00
|
|
|
|
# define flockfile(S) _IO_flockfile (S)
|
1996-05-12 16:38:08 +00:00
|
|
|
|
# define funlockfile(S) _IO_funlockfile (S)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
#else /* ! USE_IN_LIBIO */
|
|
|
|
|
/* This code is for use in the GNU C library. */
|
1996-04-03 16:31:49 +00:00
|
|
|
|
# include <stdio.h>
|
|
|
|
|
# define PUT(F, S, N) fwrite (S, 1, N, F)
|
|
|
|
|
# define ARGCHECK(S, Format) \
|
1995-02-18 01:27:10 +00:00
|
|
|
|
do \
|
|
|
|
|
{ \
|
|
|
|
|
/* Check file argument for consistence. */ \
|
1996-04-03 16:31:49 +00:00
|
|
|
|
if (!__validfp(S) || !S->__mode.__write || Format == NULL) \
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{ \
|
|
|
|
|
errno = EINVAL; \
|
|
|
|
|
return -1; \
|
|
|
|
|
} \
|
1996-04-03 16:31:49 +00:00
|
|
|
|
if (!S->__seen) \
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{ \
|
1996-04-03 16:31:49 +00:00
|
|
|
|
if (__flshfp (S, EOF) == EOF) \
|
1995-02-18 01:27:10 +00:00
|
|
|
|
return -1; \
|
|
|
|
|
} \
|
1996-04-03 16:31:49 +00:00
|
|
|
|
} \
|
|
|
|
|
while (0)
|
|
|
|
|
# define UNBUFFERED_P(s) ((s)->__buffer == NULL)
|
1996-05-12 16:38:08 +00:00
|
|
|
|
# define flockfile(S) /* nothing */
|
|
|
|
|
# define funlockfile(S) /* nothing */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
#endif /* USE_IN_LIBIO */
|
|
|
|
|
|
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
#define outchar(Ch) \
|
1995-02-18 01:27:10 +00:00
|
|
|
|
do \
|
|
|
|
|
{ \
|
1996-04-03 16:31:49 +00:00
|
|
|
|
register const int outc = (Ch); \
|
Tue Dec 5 02:27:32 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile [routines]: Remove iofscanf, add iopopen, pclose.
* libio/iofscanf.c: Remove file.
* libio/iogetdelim.c (_IO_getdelim): Correct stupid bug at string
termination.
* libio/iopopen.c: New file from GNU libio.
* libio/memstream.c: Fixed bug in fclose handling. Instead of
providing a close callback we need a finish callback.
* libio/pclose.c: New file. Derived from popen.c in GNU libio.
* posix/gnu/types.h: Fixed typo.
* stdio-common/errnobug.c: fputs returns EOF in error case. Do
not test for != 0.
* stdio-common/printf-parse.h (parse_one_spec): Do not force
padding with ' ' if precision is given. Fix by HJ Lu.
* stdio-common/printf_fp.c: Fix comment.
* stdio-common/tfformat.c, stdio-common/tiformat.c,
stdio-common/tstdiomisc.c: New files from GNU libio test suite.
* stdio-common/tstgetln.c: Provide ssize_t type when testing
libio.
* stdio-common/vfprintf.c (outchar): Use PUTC instead of putc.
(vfprintf): Cleasr args_type array before using it.
When printing 0 as an integer with precision 0 nothing must be
written for the number.
Based on patch by HJ Lu.
* stdio-common/vfscanf.c: Remove fixed input buffer. Now we
have a dynamically extended buffer.
* stdlib/strtod.c: Merge with version in Linux libc. This fixes
some bugs with handling of very small numbers and has different
solution for formaer patches.
* sysdeps/i386/i586/add_n.S, sysdeps/i386/i586/sub_n.S: Rename
macros r1 and r2 to t1, and t2 resp. This is necessary because
glibc headers also define r1.
Tue Dec 5 02:27:32 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile [routines]: Remove iofscanf, add iopopen, pclose.
* libio/iofscanf.c: Remove file.
* libio/iogetdelim.c (_IO_getdelim): Correct stupid bug at string
termination.
* libio/iopopen.c: New file from GNU libio.
* libio/memstream.c: Fixed bug in fclose handling. Instead of
providing a close callback we need a finish callback.
* libio/pclose.c: New file. Derived from popen.c in GNU libio.
* posix/gnu/types.h: Fixed typo.
* stdio-common/errnobug.c: fputs returns EOF in error case. Do
not test for != 0.
* stdio-common/printf-parse.h (parse_one_spec): Do not force
padding with ' ' if precision is given. Fix by HJ Lu.
* stdio-common/printf_fp.c: Fix comment.
* stdio-common/tfformat.c, stdio-common/tiformat.c,
stdio-common/tstdiomisc.c: New files from GNU libio test suite.
* stdio-common/tstgetln.c: Provide ssize_t type when testing
libio.
* stdio-common/vfprintf.c (outchar): Use PUTC instead of putc.
(vfprintf): Cleasr args_type array before using it.
When printing 0 as an integer with precision 0 nothing must be
written for the number.
Based on patch by HJ Lu.
* stdio-common/vfscanf.c: Remove fixed input buffer. Now we
have a dynamically extended buffer.
* stdlib/strtod.c: Merge with version in Linux libc. This fixes
some bugs with handling of very small numbers and has different
solution for formaer patches.
* sysdeps/i386/i586/add_n.S, sysdeps/i386/i586/sub_n.S: Rename
macros r1 and r2 to t1, and t2 resp. This is necessary because
glibc headers also define r1.
1995-12-05 03:35:55 +00:00
|
|
|
|
if (PUTC (outc, s) == EOF) \
|
1995-02-18 01:27:10 +00:00
|
|
|
|
return -1; \
|
|
|
|
|
else \
|
|
|
|
|
++done; \
|
1996-04-03 16:31:49 +00:00
|
|
|
|
} \
|
|
|
|
|
while (0)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
#define outstring(String, Len) \
|
1995-02-18 01:27:10 +00:00
|
|
|
|
do \
|
|
|
|
|
{ \
|
1996-04-03 16:31:49 +00:00
|
|
|
|
if (PUT (s, String, Len) != Len) \
|
|
|
|
|
return -1; \
|
|
|
|
|
done += Len; \
|
|
|
|
|
} \
|
|
|
|
|
while (0)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* For handling long_double and longlong we use the same flag. */
|
|
|
|
|
#ifndef is_longlong
|
|
|
|
|
# define is_longlong is_long_double
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Global variables. */
|
|
|
|
|
static const char null[] = "(null)";
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Helper function to provide temporary buffering for unbuffered streams. */
|
|
|
|
|
static int buffered_vfprintf __P ((FILE *stream, const CHAR_T *fmt, va_list));
|
|
|
|
|
|
|
|
|
|
/* Handle unknown format specifier. */
|
|
|
|
|
static int printf_unknown __P ((FILE *, const struct printf_info *,
|
|
|
|
|
const void *const *));
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Group digits of number string. */
|
|
|
|
|
static char *group_number __P ((CHAR_T *, CHAR_T *, const CHAR_T *, wchar_t));
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* The function itself. */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
int
|
1996-04-03 16:31:49 +00:00
|
|
|
|
vfprintf (FILE *s, const CHAR_T *format, va_list ap)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
|
|
|
|
/* The character used as thousands separator. */
|
|
|
|
|
wchar_t thousands_sep;
|
|
|
|
|
|
|
|
|
|
/* The string describing the size of groups of digits. */
|
1995-03-24 07:44:08 +00:00
|
|
|
|
const char *grouping;
|
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Place to accumulate the result. */
|
|
|
|
|
int done;
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Current character in format string. */
|
|
|
|
|
const UCHAR_T *f;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1995-03-24 07:44:08 +00:00
|
|
|
|
/* End of leading constant string. */
|
1996-04-03 16:31:49 +00:00
|
|
|
|
const UCHAR_T *lead_str_end;
|
|
|
|
|
|
|
|
|
|
/* Points to next format specifier. */
|
|
|
|
|
const UCHAR_T *end_of_spec;
|
|
|
|
|
|
|
|
|
|
/* Buffer intermediate results. */
|
|
|
|
|
char work_buffer[1000];
|
|
|
|
|
#define workend (&work_buffer[sizeof (work_buffer) - 1])
|
|
|
|
|
|
|
|
|
|
/* State for restartable multibyte character handling functions. */
|
|
|
|
|
mbstate_t mbstate;
|
|
|
|
|
|
|
|
|
|
/* We have to save the original argument pointer. */
|
|
|
|
|
va_list ap_save;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Count number of specifiers we already processed. */
|
|
|
|
|
int nspecs_done;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This table maps a character into a number representing a
|
|
|
|
|
class. In each step there is a destination label for each
|
|
|
|
|
class. */
|
|
|
|
|
static const int jump_table[] =
|
|
|
|
|
{
|
|
|
|
|
/* ' ' */ 1, 0, 0, /* '#' */ 4,
|
|
|
|
|
0, /* '%' */ 14, 0, /* '\''*/ 6,
|
|
|
|
|
0, 0, /* '*' */ 7, /* '+' */ 2,
|
|
|
|
|
0, /* '-' */ 3, /* '.' */ 9, 0,
|
|
|
|
|
/* '0' */ 5, /* '1' */ 8, /* '2' */ 8, /* '3' */ 8,
|
|
|
|
|
/* '4' */ 8, /* '5' */ 8, /* '6' */ 8, /* '7' */ 8,
|
|
|
|
|
/* '8' */ 8, /* '9' */ 8, 0, 0,
|
|
|
|
|
0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0,
|
|
|
|
|
0, /* 'E' */ 19, 0, /* 'G' */ 19,
|
|
|
|
|
0, 0, 0, 0,
|
|
|
|
|
/* 'L' */ 12, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, 0,
|
|
|
|
|
/* 'X' */ 18, 0, /* 'Z' */ 13, 0,
|
|
|
|
|
0, 0, 0, 0,
|
|
|
|
|
0, 0, 0, /* 'c' */ 20,
|
|
|
|
|
/* 'd' */ 15, /* 'e' */ 19, /* 'f' */ 19, /* 'g' */ 19,
|
|
|
|
|
/* 'h' */ 10, /* 'i' */ 15, 0, 0,
|
|
|
|
|
/* 'l' */ 11, /* 'm' */ 24, /* 'n' */ 23, /* 'o' */ 17,
|
|
|
|
|
/* 'p' */ 22, /* 'q' */ 12, 0, /* 's' */ 21,
|
|
|
|
|
0, /* 'u' */ 16, 0, 0,
|
|
|
|
|
/* 'x' */ 18
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define NOT_IN_JUMP_RANGE(Ch) ((Ch) < ' ' || (Ch) > 'x')
|
|
|
|
|
#define CHAR_CLASS(Ch) (jump_table[(int) (Ch) - ' '])
|
|
|
|
|
#define JUMP(ChExpr, table) \
|
|
|
|
|
do \
|
|
|
|
|
{ \
|
|
|
|
|
const void *ptr; \
|
|
|
|
|
spec = (ChExpr); \
|
|
|
|
|
ptr = NOT_IN_JUMP_RANGE (spec) ? REF (form_unknown) \
|
|
|
|
|
: table[CHAR_CLASS (spec)]; \
|
|
|
|
|
goto *ptr; \
|
|
|
|
|
} \
|
|
|
|
|
while (0)
|
|
|
|
|
|
|
|
|
|
#define STEP0_3_TABLE \
|
|
|
|
|
/* Step 0: at the beginning. */ \
|
|
|
|
|
static const void *step0_jumps[25] = \
|
|
|
|
|
{ \
|
|
|
|
|
REF (form_unknown), \
|
|
|
|
|
REF (flag_space), /* for ' ' */ \
|
|
|
|
|
REF (flag_plus), /* for '+' */ \
|
|
|
|
|
REF (flag_minus), /* for '-' */ \
|
|
|
|
|
REF (flag_hash), /* for '<hash>' */ \
|
|
|
|
|
REF (flag_zero), /* for '0' */ \
|
|
|
|
|
REF (flag_quote), /* for '\'' */ \
|
|
|
|
|
REF (width_asterics), /* for '*' */ \
|
|
|
|
|
REF (width), /* for '1'...'9' */ \
|
|
|
|
|
REF (precision), /* for '.' */ \
|
|
|
|
|
REF (mod_half), /* for 'h' */ \
|
|
|
|
|
REF (mod_long), /* for 'l' */ \
|
|
|
|
|
REF (mod_longlong), /* for 'L', 'q' */ \
|
|
|
|
|
REF (mod_size_t), /* for 'Z' */ \
|
|
|
|
|
REF (form_percent), /* for '%' */ \
|
|
|
|
|
REF (form_integer), /* for 'd', 'i' */ \
|
|
|
|
|
REF (form_unsigned), /* for 'u' */ \
|
|
|
|
|
REF (form_octal), /* for 'o' */ \
|
|
|
|
|
REF (form_hexa), /* for 'X', 'x' */ \
|
|
|
|
|
REF (form_float), /* for 'E', 'e', 'f', 'G', 'g' */ \
|
|
|
|
|
REF (form_character), /* for 'c' */ \
|
|
|
|
|
REF (form_string), /* for 's' */ \
|
|
|
|
|
REF (form_pointer), /* for 'p' */ \
|
|
|
|
|
REF (form_number), /* for 'n' */ \
|
|
|
|
|
REF (form_strerror) /* for 'm' */ \
|
|
|
|
|
}; \
|
|
|
|
|
/* Step 1: after processing width. */ \
|
|
|
|
|
static const void *step1_jumps[25] = \
|
|
|
|
|
{ \
|
|
|
|
|
REF (form_unknown), \
|
|
|
|
|
REF (form_unknown), /* for ' ' */ \
|
|
|
|
|
REF (form_unknown), /* for '+' */ \
|
|
|
|
|
REF (form_unknown), /* for '-' */ \
|
|
|
|
|
REF (form_unknown), /* for '<hash>' */ \
|
|
|
|
|
REF (form_unknown), /* for '0' */ \
|
|
|
|
|
REF (form_unknown), /* for '\'' */ \
|
|
|
|
|
REF (form_unknown), /* for '*' */ \
|
|
|
|
|
REF (form_unknown), /* for '1'...'9' */ \
|
|
|
|
|
REF (precision), /* for '.' */ \
|
|
|
|
|
REF (mod_half), /* for 'h' */ \
|
|
|
|
|
REF (mod_long), /* for 'l' */ \
|
|
|
|
|
REF (mod_longlong), /* for 'L', 'q' */ \
|
|
|
|
|
REF (mod_size_t), /* for 'Z' */ \
|
|
|
|
|
REF (form_percent), /* for '%' */ \
|
|
|
|
|
REF (form_integer), /* for 'd', 'i' */ \
|
|
|
|
|
REF (form_unsigned), /* for 'u' */ \
|
|
|
|
|
REF (form_octal), /* for 'o' */ \
|
|
|
|
|
REF (form_hexa), /* for 'X', 'x' */ \
|
|
|
|
|
REF (form_float), /* for 'E', 'e', 'f', 'G', 'g' */ \
|
|
|
|
|
REF (form_character), /* for 'c' */ \
|
|
|
|
|
REF (form_string), /* for 's' */ \
|
|
|
|
|
REF (form_pointer), /* for 'p' */ \
|
|
|
|
|
REF (form_number), /* for 'n' */ \
|
|
|
|
|
REF (form_strerror) /* for 'm' */ \
|
|
|
|
|
}; \
|
|
|
|
|
/* Step 2: after processing precision. */ \
|
|
|
|
|
static const void *step2_jumps[25] = \
|
|
|
|
|
{ \
|
|
|
|
|
REF (form_unknown), \
|
|
|
|
|
REF (form_unknown), /* for ' ' */ \
|
|
|
|
|
REF (form_unknown), /* for '+' */ \
|
|
|
|
|
REF (form_unknown), /* for '-' */ \
|
|
|
|
|
REF (form_unknown), /* for '<hash>' */ \
|
|
|
|
|
REF (form_unknown), /* for '0' */ \
|
|
|
|
|
REF (form_unknown), /* for '\'' */ \
|
|
|
|
|
REF (form_unknown), /* for '*' */ \
|
|
|
|
|
REF (form_unknown), /* for '1'...'9' */ \
|
|
|
|
|
REF (form_unknown), /* for '.' */ \
|
|
|
|
|
REF (mod_half), /* for 'h' */ \
|
|
|
|
|
REF (mod_long), /* for 'l' */ \
|
|
|
|
|
REF (mod_longlong), /* for 'L', 'q' */ \
|
|
|
|
|
REF (mod_size_t), /* for 'Z' */ \
|
|
|
|
|
REF (form_percent), /* for '%' */ \
|
|
|
|
|
REF (form_integer), /* for 'd', 'i' */ \
|
|
|
|
|
REF (form_unsigned), /* for 'u' */ \
|
|
|
|
|
REF (form_octal), /* for 'o' */ \
|
|
|
|
|
REF (form_hexa), /* for 'X', 'x' */ \
|
|
|
|
|
REF (form_float), /* for 'E', 'e', 'f', 'G', 'g' */ \
|
|
|
|
|
REF (form_character), /* for 'c' */ \
|
|
|
|
|
REF (form_string), /* for 's' */ \
|
|
|
|
|
REF (form_pointer), /* for 'p' */ \
|
|
|
|
|
REF (form_number), /* for 'n' */ \
|
|
|
|
|
REF (form_strerror) /* for 'm' */ \
|
|
|
|
|
}; \
|
|
|
|
|
/* Step 3: after processing first 'l' modifier. */ \
|
|
|
|
|
static const void *step3_jumps[25] = \
|
|
|
|
|
{ \
|
|
|
|
|
REF (form_unknown), \
|
|
|
|
|
REF (form_unknown), /* for ' ' */ \
|
|
|
|
|
REF (form_unknown), /* for '+' */ \
|
|
|
|
|
REF (form_unknown), /* for '-' */ \
|
|
|
|
|
REF (form_unknown), /* for '<hash>' */ \
|
|
|
|
|
REF (form_unknown), /* for '0' */ \
|
|
|
|
|
REF (form_unknown), /* for '\'' */ \
|
|
|
|
|
REF (form_unknown), /* for '*' */ \
|
|
|
|
|
REF (form_unknown), /* for '1'...'9' */ \
|
|
|
|
|
REF (form_unknown), /* for '.' */ \
|
|
|
|
|
REF (form_unknown), /* for 'h' */ \
|
|
|
|
|
REF (mod_longlong), /* for 'l' */ \
|
|
|
|
|
REF (form_unknown), /* for 'L', 'q' */ \
|
|
|
|
|
REF (form_unknown), /* for 'Z' */ \
|
|
|
|
|
REF (form_percent), /* for '%' */ \
|
|
|
|
|
REF (form_integer), /* for 'd', 'i' */ \
|
|
|
|
|
REF (form_unsigned), /* for 'u' */ \
|
|
|
|
|
REF (form_octal), /* for 'o' */ \
|
|
|
|
|
REF (form_hexa), /* for 'X', 'x' */ \
|
|
|
|
|
REF (form_float), /* for 'E', 'e', 'f', 'G', 'g' */ \
|
|
|
|
|
REF (form_character), /* for 'c' */ \
|
|
|
|
|
REF (form_string), /* for 's' */ \
|
|
|
|
|
REF (form_pointer), /* for 'p' */ \
|
|
|
|
|
REF (form_number), /* for 'n' */ \
|
|
|
|
|
REF (form_strerror) /* for 'm' */ \
|
|
|
|
|
}
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
#define STEP4_TABLE \
|
|
|
|
|
/* Step 4: processing format specifier. */ \
|
|
|
|
|
static const void *step4_jumps[25] = \
|
|
|
|
|
{ \
|
|
|
|
|
REF (form_unknown), \
|
|
|
|
|
REF (form_unknown), /* for ' ' */ \
|
|
|
|
|
REF (form_unknown), /* for '+' */ \
|
|
|
|
|
REF (form_unknown), /* for '-' */ \
|
|
|
|
|
REF (form_unknown), /* for '<hash>' */ \
|
|
|
|
|
REF (form_unknown), /* for '0' */ \
|
|
|
|
|
REF (form_unknown), /* for '\'' */ \
|
|
|
|
|
REF (form_unknown), /* for '*' */ \
|
|
|
|
|
REF (form_unknown), /* for '1'...'9' */ \
|
|
|
|
|
REF (form_unknown), /* for '.' */ \
|
|
|
|
|
REF (form_unknown), /* for 'h' */ \
|
|
|
|
|
REF (form_unknown), /* for 'l' */ \
|
|
|
|
|
REF (form_unknown), /* for 'L', 'q' */ \
|
|
|
|
|
REF (form_unknown), /* for 'Z' */ \
|
|
|
|
|
REF (form_percent), /* for '%' */ \
|
|
|
|
|
REF (form_integer), /* for 'd', 'i' */ \
|
|
|
|
|
REF (form_unsigned), /* for 'u' */ \
|
|
|
|
|
REF (form_octal), /* for 'o' */ \
|
|
|
|
|
REF (form_hexa), /* for 'X', 'x' */ \
|
|
|
|
|
REF (form_float), /* for 'E', 'e', 'f', 'G', 'g' */ \
|
|
|
|
|
REF (form_character), /* for 'c' */ \
|
|
|
|
|
REF (form_string), /* for 's' */ \
|
|
|
|
|
REF (form_pointer), /* for 'p' */ \
|
|
|
|
|
REF (form_number), /* for 'n' */ \
|
|
|
|
|
REF (form_strerror) /* for 'm' */ \
|
|
|
|
|
}
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
#define process_arg(fspec) \
|
|
|
|
|
/* Start real work. We know about all flag and modifiers and \
|
|
|
|
|
now process the wanted format specifier. */ \
|
|
|
|
|
LABEL (form_percent): \
|
|
|
|
|
/* Write a literal "%". */ \
|
|
|
|
|
outchar ('%'); \
|
|
|
|
|
break; \
|
|
|
|
|
\
|
|
|
|
|
LABEL (form_integer): \
|
|
|
|
|
/* Signed decimal integer. */ \
|
|
|
|
|
base = 10; \
|
|
|
|
|
\
|
|
|
|
|
if (is_longlong) \
|
|
|
|
|
{ \
|
|
|
|
|
long long int signed_number; \
|
|
|
|
|
\
|
|
|
|
|
signed_number = va_arg (ap, long long int); \
|
|
|
|
|
\
|
|
|
|
|
is_negative = signed_number < 0; \
|
|
|
|
|
number.longlong = is_negative ? (- signed_number) : signed_number; \
|
|
|
|
|
\
|
|
|
|
|
goto LABEL (longlong_number); \
|
|
|
|
|
} \
|
|
|
|
|
else \
|
|
|
|
|
{ \
|
|
|
|
|
long int signed_number; \
|
|
|
|
|
\
|
|
|
|
|
if (is_long) \
|
|
|
|
|
signed_number = va_arg (ap, long int); \
|
|
|
|
|
else /* `short int' will be promoted to `int'. */ \
|
|
|
|
|
signed_number = va_arg (ap, int); \
|
|
|
|
|
\
|
|
|
|
|
is_negative = signed_number < 0; \
|
|
|
|
|
number.word = is_negative ? (- signed_number) : signed_number; \
|
|
|
|
|
\
|
|
|
|
|
goto LABEL (number); \
|
|
|
|
|
} \
|
|
|
|
|
/* NOTREACHED */ \
|
|
|
|
|
\
|
|
|
|
|
LABEL (form_unsigned): \
|
|
|
|
|
/* Unsigned decimal integer. */ \
|
|
|
|
|
base = 10; \
|
|
|
|
|
goto LABEL (unsigned_number); \
|
|
|
|
|
/* NOTREACHED */ \
|
|
|
|
|
\
|
|
|
|
|
LABEL (form_octal): \
|
|
|
|
|
/* Unsigned octal integer. */ \
|
|
|
|
|
base = 8; \
|
|
|
|
|
goto LABEL (unsigned_number); \
|
|
|
|
|
/* NOTREACHED */ \
|
|
|
|
|
\
|
|
|
|
|
LABEL (form_hexa): \
|
|
|
|
|
/* Unsigned hexadecimal integer. */ \
|
|
|
|
|
base = 16; \
|
|
|
|
|
\
|
|
|
|
|
LABEL (unsigned_number): /* Unsigned number of base BASE. */ \
|
|
|
|
|
\
|
|
|
|
|
/* ANSI specifies the `+' and ` ' flags only for signed \
|
|
|
|
|
conversions. */ \
|
|
|
|
|
is_negative = 0; \
|
|
|
|
|
showsign = 0; \
|
|
|
|
|
space = 0; \
|
|
|
|
|
\
|
|
|
|
|
if (is_longlong) \
|
|
|
|
|
{ \
|
|
|
|
|
number.longlong = va_arg (ap, unsigned long long int); \
|
|
|
|
|
\
|
|
|
|
|
LABEL (longlong_number): \
|
|
|
|
|
if (prec < 0) \
|
|
|
|
|
/* Supply a default precision if none was given. */ \
|
|
|
|
|
prec = 1; \
|
|
|
|
|
else \
|
|
|
|
|
/* We have to take care for the '0' flag. If a precision \
|
|
|
|
|
is given it must be ignored. */ \
|
|
|
|
|
pad = ' '; \
|
|
|
|
|
\
|
|
|
|
|
/* If the precision is 0 and the number is 0 nothing has to \
|
|
|
|
|
be written for the number. */ \
|
|
|
|
|
if (prec == 0 && number.longlong == 0) \
|
|
|
|
|
string = workend; \
|
|
|
|
|
else \
|
|
|
|
|
{ \
|
|
|
|
|
/* Put the number in WORK. */ \
|
|
|
|
|
string = _itoa (number.longlong, workend + 1, base, \
|
|
|
|
|
spec == 'X'); \
|
|
|
|
|
string -= 1; \
|
|
|
|
|
if (group && grouping) \
|
|
|
|
|
string = group_number (string, workend, grouping, \
|
|
|
|
|
thousands_sep); \
|
|
|
|
|
} \
|
|
|
|
|
/* Simply further test for num != 0. */ \
|
|
|
|
|
number.word = number.longlong != 0; \
|
|
|
|
|
} \
|
|
|
|
|
else \
|
|
|
|
|
{ \
|
|
|
|
|
if (is_long) \
|
|
|
|
|
number.word = va_arg (ap, unsigned long int); \
|
|
|
|
|
else \
|
|
|
|
|
number.word = va_arg (ap, unsigned int); /* Promoted. */ \
|
|
|
|
|
\
|
|
|
|
|
LABEL (number): \
|
|
|
|
|
if (prec < 0) \
|
|
|
|
|
/* Supply a default precision if none was given. */ \
|
|
|
|
|
prec = 1; \
|
|
|
|
|
else \
|
|
|
|
|
/* We have to take care for the '0' flag. If a precision \
|
|
|
|
|
is given it must be ignored. */ \
|
|
|
|
|
pad = ' '; \
|
|
|
|
|
\
|
|
|
|
|
/* If the precision is 0 and the number is 0 nothing has to \
|
|
|
|
|
be written for the number. */ \
|
|
|
|
|
if (prec == 0 && number.word == 0) \
|
|
|
|
|
string = workend; \
|
|
|
|
|
else \
|
|
|
|
|
{ \
|
|
|
|
|
/* Put the number in WORK. */ \
|
|
|
|
|
string = _itoa_word (number.word, workend + 1, base, \
|
|
|
|
|
spec == 'X'); \
|
|
|
|
|
string -= 1; \
|
|
|
|
|
if (group && grouping) \
|
|
|
|
|
string = group_number (string, workend, grouping, \
|
|
|
|
|
thousands_sep); \
|
|
|
|
|
} \
|
|
|
|
|
} \
|
|
|
|
|
\
|
|
|
|
|
prec -= workend - string; \
|
|
|
|
|
\
|
|
|
|
|
if (prec > 0) \
|
|
|
|
|
/* Add zeros to the precision. */ \
|
|
|
|
|
while (prec-- > 0) \
|
|
|
|
|
*string-- = '0'; \
|
|
|
|
|
else if (number.word != 0 && alt && base == 8) \
|
|
|
|
|
/* Add octal marker. */ \
|
|
|
|
|
*string-- = '0'; \
|
|
|
|
|
\
|
|
|
|
|
if (!left) \
|
|
|
|
|
{ \
|
|
|
|
|
width -= workend - string; \
|
|
|
|
|
\
|
|
|
|
|
if (number.word != 0 && alt && base == 16) \
|
|
|
|
|
/* Account for 0X hex marker. */ \
|
|
|
|
|
width -= 2; \
|
|
|
|
|
\
|
|
|
|
|
if (is_negative || showsign || space) \
|
|
|
|
|
--width; \
|
|
|
|
|
\
|
|
|
|
|
if (pad == '0') \
|
|
|
|
|
{ \
|
|
|
|
|
while (width-- > 0) \
|
|
|
|
|
*string-- = '0'; \
|
|
|
|
|
\
|
|
|
|
|
if (number.word != 0 && alt && base == 16) \
|
|
|
|
|
{ \
|
|
|
|
|
*string-- = spec; \
|
|
|
|
|
*string-- = '0'; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
|
|
|
|
if (is_negative) \
|
|
|
|
|
*string-- = '-'; \
|
|
|
|
|
else if (showsign) \
|
|
|
|
|
*string-- = '+'; \
|
|
|
|
|
else if (space) \
|
|
|
|
|
*string-- = ' '; \
|
|
|
|
|
} \
|
|
|
|
|
else \
|
|
|
|
|
{ \
|
|
|
|
|
if (number.word != 0 && alt && base == 16) \
|
|
|
|
|
{ \
|
|
|
|
|
*string-- = spec; \
|
|
|
|
|
*string-- = '0'; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
|
|
|
|
if (is_negative) \
|
|
|
|
|
*string-- = '-'; \
|
|
|
|
|
else if (showsign) \
|
|
|
|
|
*string-- = '+'; \
|
|
|
|
|
else if (space) \
|
|
|
|
|
*string-- = ' '; \
|
|
|
|
|
\
|
|
|
|
|
while (width-- > 0) \
|
|
|
|
|
*string-- = ' '; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
|
|
|
|
outstring (string + 1, workend - string); \
|
|
|
|
|
\
|
|
|
|
|
break; \
|
|
|
|
|
} \
|
|
|
|
|
else \
|
|
|
|
|
{ \
|
|
|
|
|
if (number.word != 0 && alt && base == 16) \
|
|
|
|
|
{ \
|
|
|
|
|
*string-- = spec; \
|
|
|
|
|
*string-- = '0'; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
|
|
|
|
if (is_negative) \
|
|
|
|
|
*string-- = '-'; \
|
|
|
|
|
else if (showsign) \
|
|
|
|
|
*string-- = '+'; \
|
|
|
|
|
else if (space) \
|
|
|
|
|
*string-- = ' '; \
|
|
|
|
|
\
|
|
|
|
|
width -= workend - string; \
|
|
|
|
|
outstring (string + 1, workend - string); \
|
|
|
|
|
\
|
|
|
|
|
PAD (' '); \
|
|
|
|
|
break; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
|
|
|
|
LABEL (form_float): \
|
|
|
|
|
{ \
|
|
|
|
|
/* Floating-point number. This is handled by printf_fp.c. */ \
|
|
|
|
|
extern int __printf_fp __P ((FILE *, const struct printf_info *, \
|
|
|
|
|
const void **const)); \
|
|
|
|
|
const void *ptr; \
|
|
|
|
|
int function_done; \
|
|
|
|
|
\
|
|
|
|
|
if (is_long_double) \
|
|
|
|
|
the_arg.pa_long_double = va_arg (ap, long double); \
|
|
|
|
|
else \
|
|
|
|
|
the_arg.pa_double = va_arg (ap, double); \
|
|
|
|
|
\
|
|
|
|
|
ptr = (const void *) &the_arg; \
|
|
|
|
|
\
|
|
|
|
|
if (fspec == NULL) \
|
|
|
|
|
{ \
|
|
|
|
|
struct printf_info info = { prec: prec, \
|
|
|
|
|
width: width, \
|
|
|
|
|
spec: spec, \
|
|
|
|
|
is_long_double: is_long_double, \
|
|
|
|
|
is_short: is_short, \
|
|
|
|
|
is_long: is_long, \
|
|
|
|
|
alt: alt, \
|
|
|
|
|
space: space, \
|
|
|
|
|
left: left, \
|
|
|
|
|
showsign: showsign, \
|
|
|
|
|
group: group, \
|
|
|
|
|
pad: pad }; \
|
|
|
|
|
\
|
|
|
|
|
function_done = __printf_fp (s, &info, &ptr); \
|
|
|
|
|
} \
|
|
|
|
|
else \
|
|
|
|
|
function_done = __printf_fp (s, &fspec->info, &ptr); \
|
|
|
|
|
\
|
|
|
|
|
if (function_done < 0) \
|
|
|
|
|
/* Error in print handler. */ \
|
|
|
|
|
return -1; \
|
|
|
|
|
\
|
|
|
|
|
done += function_done; \
|
|
|
|
|
} \
|
|
|
|
|
break; \
|
|
|
|
|
\
|
|
|
|
|
LABEL (form_character): \
|
|
|
|
|
/* Character. */ \
|
|
|
|
|
--width; /* Account for the character itself. */ \
|
|
|
|
|
if (!left) \
|
|
|
|
|
PAD (' '); \
|
|
|
|
|
outchar ((unsigned char) va_arg (ap, int)); /* Promoted. */ \
|
|
|
|
|
if (left) \
|
|
|
|
|
PAD (' '); \
|
|
|
|
|
break; \
|
|
|
|
|
\
|
|
|
|
|
LABEL (form_string): \
|
|
|
|
|
{ \
|
|
|
|
|
size_t len; \
|
|
|
|
|
\
|
|
|
|
|
/* The string argument could in fact be `char *' or `wchar_t *'. \
|
|
|
|
|
But this should not make a difference here. */ \
|
|
|
|
|
string = (char *) va_arg (ap, const char *); \
|
|
|
|
|
\
|
|
|
|
|
/* Entry point for printing other strings. */ \
|
|
|
|
|
LABEL (print_string): \
|
|
|
|
|
\
|
|
|
|
|
if (string == NULL) \
|
|
|
|
|
{ \
|
|
|
|
|
/* Write "(null)" if there's space. */ \
|
|
|
|
|
if (prec == -1 || prec >= (int) sizeof (null) - 1) \
|
|
|
|
|
{ \
|
|
|
|
|
string = (char *) null; \
|
|
|
|
|
len = sizeof (null) - 1; \
|
|
|
|
|
} \
|
|
|
|
|
else \
|
|
|
|
|
{ \
|
|
|
|
|
string = (char *) ""; \
|
|
|
|
|
len = 0; \
|
|
|
|
|
} \
|
|
|
|
|
} \
|
|
|
|
|
else if (!is_long) \
|
|
|
|
|
{ \
|
|
|
|
|
if (prec != -1) \
|
|
|
|
|
{ \
|
|
|
|
|
/* Search for the end of the string, but don't search past \
|
|
|
|
|
the length specified by the precision. */ \
|
|
|
|
|
const char *end = memchr (string, '\0', prec); \
|
|
|
|
|
if (end) \
|
|
|
|
|
len = end - string; \
|
|
|
|
|
else \
|
|
|
|
|
len = prec; \
|
|
|
|
|
} \
|
|
|
|
|
else \
|
|
|
|
|
len = strlen (string); \
|
|
|
|
|
} \
|
|
|
|
|
else \
|
|
|
|
|
{ \
|
|
|
|
|
const wchar_t *s2 = (const wchar_t *) string; \
|
|
|
|
|
mbstate_t mbstate = 0; \
|
|
|
|
|
\
|
|
|
|
|
len = wcsrtombs (NULL, &s2, prec != -1 ? prec : UINT_MAX, \
|
|
|
|
|
&mbstate); \
|
|
|
|
|
if (len == (size_t) -1) \
|
|
|
|
|
/* Illegal wide-character string. */ \
|
|
|
|
|
return -1; \
|
|
|
|
|
\
|
|
|
|
|
s2 = (const wchar_t *) string; \
|
|
|
|
|
mbstate = 0; \
|
|
|
|
|
string = alloca (len + 1); \
|
|
|
|
|
(void) wcsrtombs (string, &s2, prec != -1 ? prec : UINT_MAX, \
|
|
|
|
|
&mbstate); \
|
|
|
|
|
} \
|
|
|
|
|
\
|
|
|
|
|
if ((width -= len) < 0) \
|
|
|
|
|
{ \
|
|
|
|
|
outstring (string, len); \
|
|
|
|
|
break; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
|
|
|
|
if (!left) \
|
|
|
|
|
PAD (' '); \
|
|
|
|
|
outstring (string, len); \
|
|
|
|
|
if (left) \
|
|
|
|
|
PAD (' '); \
|
|
|
|
|
} \
|
|
|
|
|
break; \
|
|
|
|
|
\
|
|
|
|
|
LABEL (form_pointer): \
|
|
|
|
|
/* Generic pointer. */ \
|
|
|
|
|
{ \
|
|
|
|
|
const void *ptr; \
|
|
|
|
|
ptr = va_arg (ap, void *); \
|
|
|
|
|
if (ptr != NULL) \
|
|
|
|
|
{ \
|
|
|
|
|
/* If the pointer is not NULL, write it as a %#x spec. */ \
|
|
|
|
|
base = 16; \
|
|
|
|
|
number.word = (unsigned long int) ptr; \
|
|
|
|
|
is_negative = 0; \
|
|
|
|
|
alt = 1; \
|
|
|
|
|
group = 0; \
|
|
|
|
|
spec = 'x'; \
|
|
|
|
|
goto LABEL (number); \
|
|
|
|
|
} \
|
|
|
|
|
else \
|
|
|
|
|
{ \
|
|
|
|
|
/* Write "(nil)" for a nil pointer. */ \
|
|
|
|
|
string = (char *) "(nil)"; \
|
|
|
|
|
/* Make sure the full string "(nil)" is printed. */ \
|
|
|
|
|
if (prec < 5) \
|
|
|
|
|
prec = 5; \
|
|
|
|
|
is_long = 0; /* This is no wide-char string. */ \
|
|
|
|
|
goto LABEL (print_string); \
|
|
|
|
|
} \
|
|
|
|
|
} \
|
|
|
|
|
/* NOTREACHED */ \
|
|
|
|
|
\
|
|
|
|
|
LABEL (form_number): \
|
|
|
|
|
/* Answer the count of characters written. */ \
|
|
|
|
|
if (is_longlong) \
|
|
|
|
|
*(long long int *) va_arg (ap, void *) = done; \
|
|
|
|
|
else if (is_long) \
|
|
|
|
|
*(long int *) va_arg (ap, void *) = done; \
|
|
|
|
|
else if (!is_short) \
|
|
|
|
|
*(int *) va_arg (ap, void *) = done; \
|
|
|
|
|
else \
|
|
|
|
|
*(short int *) va_arg (ap, void *) = done; \
|
|
|
|
|
break; \
|
|
|
|
|
\
|
|
|
|
|
LABEL (form_strerror): \
|
|
|
|
|
/* Print description of error ERRNO. */ \
|
|
|
|
|
{ \
|
|
|
|
|
extern char *_strerror_internal __P ((int, char *buf, size_t)); \
|
|
|
|
|
\
|
|
|
|
|
string = (char *) \
|
|
|
|
|
_strerror_internal (errno, work_buffer, sizeof work_buffer); \
|
|
|
|
|
} \
|
|
|
|
|
is_long = 0; /* This is no wide-char string. */ \
|
|
|
|
|
goto LABEL (print_string)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Sanity check of arguments. */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
ARGCHECK (s, format);
|
|
|
|
|
|
|
|
|
|
if (UNBUFFERED_P (s))
|
|
|
|
|
/* Use a helper function which will allocate a local temporary buffer
|
|
|
|
|
for the stream and then call us again. */
|
1995-03-24 07:44:08 +00:00
|
|
|
|
return buffered_vfprintf (s, format, ap);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Initialize local variables. */
|
|
|
|
|
done = 0;
|
|
|
|
|
grouping = (const char *) -1;
|
|
|
|
|
mbstate = 0;
|
|
|
|
|
ap_save = ap;
|
|
|
|
|
nspecs_done = 0;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Find the first format specifier. */
|
|
|
|
|
f = lead_str_end = find_spec (format, &mbstate);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 00:37:21 +00:00
|
|
|
|
/* Lock stream. */
|
|
|
|
|
flockfile (s);
|
1996-05-12 16:38:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Write the literal text before the first format. */
|
|
|
|
|
outstring ((const UCHAR_T *) format,
|
|
|
|
|
lead_str_end - (const UCHAR_T *) format);
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* If we only have to print a simple string, return now. */
|
|
|
|
|
if (*f == L_('\0'))
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 00:37:21 +00:00
|
|
|
|
{
|
|
|
|
|
funlockfile (s);
|
|
|
|
|
return done;
|
|
|
|
|
}
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Process whole format string. */
|
|
|
|
|
do
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
1996-04-03 16:31:49 +00:00
|
|
|
|
#define REF(Name) &&do_##Name
|
|
|
|
|
#define LABEL(Name) do_##Name
|
|
|
|
|
STEP0_3_TABLE;
|
|
|
|
|
STEP4_TABLE;
|
|
|
|
|
|
|
|
|
|
int is_negative; /* Flag for negative number. */
|
|
|
|
|
union
|
|
|
|
|
{
|
|
|
|
|
unsigned long long int longlong;
|
|
|
|
|
unsigned long int word;
|
|
|
|
|
} number;
|
|
|
|
|
int base;
|
|
|
|
|
union printf_arg the_arg;
|
|
|
|
|
char *string; /* Pointer to argument string. */
|
|
|
|
|
int alt = 0; /* Alternate format. */
|
|
|
|
|
int space = 0; /* Use space prefix if no sign is needed. */
|
|
|
|
|
int left = 0; /* Left-justify output. */
|
|
|
|
|
int showsign = 0; /* Always begin with plus or minus sign. */
|
|
|
|
|
int group = 0; /* Print numbers according grouping rules. */
|
|
|
|
|
int is_long_double = 0; /* Argument is long double/ long long int. */
|
|
|
|
|
int is_short = 0; /* Argument is long int. */
|
|
|
|
|
int is_long = 0; /* Argument is short int. */
|
|
|
|
|
int width = 0; /* Width of output; 0 means none specified. */
|
|
|
|
|
int prec = -1; /* Precision of output; -1 means none specified. */
|
|
|
|
|
char pad = ' '; /* Padding character. */
|
|
|
|
|
CHAR_T spec;
|
|
|
|
|
|
|
|
|
|
/* Get current character in format string. */
|
|
|
|
|
JUMP (*++f, step0_jumps);
|
|
|
|
|
|
|
|
|
|
/* ' ' flag. */
|
|
|
|
|
LABEL (flag_space):
|
|
|
|
|
space = 1;
|
|
|
|
|
JUMP (*++f, step0_jumps);
|
|
|
|
|
|
|
|
|
|
/* '+' flag. */
|
|
|
|
|
LABEL (flag_plus):
|
|
|
|
|
showsign = 1;
|
|
|
|
|
JUMP (*++f, step0_jumps);
|
|
|
|
|
|
|
|
|
|
/* The '-' flag. */
|
|
|
|
|
LABEL (flag_minus):
|
|
|
|
|
left = 1;
|
|
|
|
|
pad = L_(' ');
|
|
|
|
|
JUMP (*++f, step0_jumps);
|
|
|
|
|
|
|
|
|
|
/* The '#' flag. */
|
|
|
|
|
LABEL (flag_hash):
|
|
|
|
|
alt = 1;
|
|
|
|
|
JUMP (*++f, step0_jumps);
|
|
|
|
|
|
|
|
|
|
/* The '0' flag. */
|
|
|
|
|
LABEL (flag_zero):
|
|
|
|
|
if (!left)
|
|
|
|
|
pad = L_('0');
|
|
|
|
|
JUMP (*++f, step0_jumps);
|
|
|
|
|
|
|
|
|
|
/* The '\'' flag. */
|
|
|
|
|
LABEL (flag_quote):
|
|
|
|
|
group = 1;
|
|
|
|
|
|
|
|
|
|
/* XXX Completely wrong. Use wctob. */
|
|
|
|
|
if (grouping == (const char *) -1)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Figure out the thousands separator character. */
|
|
|
|
|
if (mbtowc (&thousands_sep,
|
|
|
|
|
_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
|
|
|
|
|
strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0)
|
|
|
|
|
thousands_sep = (wchar_t)
|
|
|
|
|
*_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
|
|
|
|
|
grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
|
|
|
|
|
if (*grouping == '\0' || *grouping == CHAR_MAX
|
|
|
|
|
|| thousands_sep == L'\0')
|
|
|
|
|
grouping = NULL;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
1996-04-03 16:31:49 +00:00
|
|
|
|
JUMP (*++f, step0_jumps);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Get width from argument. */
|
|
|
|
|
LABEL (width_asterics):
|
|
|
|
|
{
|
|
|
|
|
const UCHAR_T *tmp; /* Temporary value. */
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
tmp = ++f;
|
|
|
|
|
if (ISDIGIT (*tmp) && read_int (&tmp) && *tmp == L_('$'))
|
Fri Apr 19 00:49:44 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* stdlib/rpmatch.c (rpmatch: try): Take new arg NOMATCH, return value
for nonmatching nonerror (instead of !MATCH).
(rpmatch): Use it, so we return -1 when NOEXPR doesn't match either.
* resolv/getnetnamadr.c (getnetbyaddr): Use u_int32_t instead of
unsigned long for variable NET2.
* time/etcetera, time/europe, time/solar89: Updated from ADO's 96e.
Tue Apr 9 14:37:31 1996 Ulrich Drepper <drepper@cygnus.com>
* catgets/Makefile, catgets/catgets.c, catgets/catgetsinfo.h,
catgets/config.h, catgets/gencat.c, catgets/nl_types.h,
catgets/open_catalog.c: New files. Implementation of XPG4
compliant catgets() function and needed tools.
* Makefile (subdirs): Add catgets.
Thu Apr 18 23:36:11 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* math/Makefile (CPPFLAGS): Append -D__NO_MATH_INLINES.
Wed Apr 10 20:48:43 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/vfprintf.c: Correct some typos.
* sysdeps/libm-ieee754/w_gammaf.c, sysdeps/libm-ieee754/w_lgamma.c,
sysdeps/libm-ieee754/w_lgammaf.c: Reference signgam instead of
__signgam.
Thu Apr 18 21:07:27 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Makerules (no-whole-archive): New variable.
(build-shlib): Use it.
* elf/Makefile (libdl.so): Use it.
* configure.in (libc_cv_ld_no_whole_archive): New check for
--no-whole-archive.
* config.make.in (have-no-whole-archive): New variable.
* stdio-common/printf_fp.c: Increase fudge factor for BIGNUM_SIZE calc
from 3 to 4.
* Make-dist: Include version.mk.
(version, release): Variables removed.
* Makeconfig (version.mk): New target.
Fri Apr 19 01:42:18 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/Makefile (headers): Add langinfo.h.
(CPPFLAGS): Remove -Iliblib.
1996-04-20 00:05:25 +00:00
|
|
|
|
/* The width comes from a positional parameter. */
|
1996-04-03 16:31:49 +00:00
|
|
|
|
goto do_positional;
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
width = va_arg (ap, int);
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Negative width means left justified. */
|
|
|
|
|
if (width < 0)
|
|
|
|
|
{
|
|
|
|
|
width = -width;
|
|
|
|
|
pad = L_(' ');
|
|
|
|
|
left = 1;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
JUMP (*f, step1_jumps);
|
|
|
|
|
|
|
|
|
|
/* Given width in format string. */
|
|
|
|
|
LABEL (width):
|
|
|
|
|
width = read_int (&f);
|
|
|
|
|
if (*f == L_('$'))
|
Fri Apr 19 00:49:44 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* stdlib/rpmatch.c (rpmatch: try): Take new arg NOMATCH, return value
for nonmatching nonerror (instead of !MATCH).
(rpmatch): Use it, so we return -1 when NOEXPR doesn't match either.
* resolv/getnetnamadr.c (getnetbyaddr): Use u_int32_t instead of
unsigned long for variable NET2.
* time/etcetera, time/europe, time/solar89: Updated from ADO's 96e.
Tue Apr 9 14:37:31 1996 Ulrich Drepper <drepper@cygnus.com>
* catgets/Makefile, catgets/catgets.c, catgets/catgetsinfo.h,
catgets/config.h, catgets/gencat.c, catgets/nl_types.h,
catgets/open_catalog.c: New files. Implementation of XPG4
compliant catgets() function and needed tools.
* Makefile (subdirs): Add catgets.
Thu Apr 18 23:36:11 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* math/Makefile (CPPFLAGS): Append -D__NO_MATH_INLINES.
Wed Apr 10 20:48:43 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/vfprintf.c: Correct some typos.
* sysdeps/libm-ieee754/w_gammaf.c, sysdeps/libm-ieee754/w_lgamma.c,
sysdeps/libm-ieee754/w_lgammaf.c: Reference signgam instead of
__signgam.
Thu Apr 18 21:07:27 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Makerules (no-whole-archive): New variable.
(build-shlib): Use it.
* elf/Makefile (libdl.so): Use it.
* configure.in (libc_cv_ld_no_whole_archive): New check for
--no-whole-archive.
* config.make.in (have-no-whole-archive): New variable.
* stdio-common/printf_fp.c: Increase fudge factor for BIGNUM_SIZE calc
from 3 to 4.
* Make-dist: Include version.mk.
(version, release): Variables removed.
* Makeconfig (version.mk): New target.
Fri Apr 19 01:42:18 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/Makefile (headers): Add langinfo.h.
(CPPFLAGS): Remove -Iliblib.
1996-04-20 00:05:25 +00:00
|
|
|
|
/* Oh, oh. The argument comes from a positional parameter. */
|
1996-04-03 16:31:49 +00:00
|
|
|
|
goto do_positional;
|
|
|
|
|
JUMP (*f, step1_jumps);
|
|
|
|
|
|
|
|
|
|
LABEL (precision):
|
|
|
|
|
++f;
|
|
|
|
|
if (*f == L_('*'))
|
|
|
|
|
{
|
|
|
|
|
const UCHAR_T *tmp; /* Temporary value. */
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
tmp = ++f;
|
|
|
|
|
if (ISDIGIT (*tmp) && read_int (&tmp) > 0 && *tmp == L_('$'))
|
Fri Apr 19 00:49:44 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* stdlib/rpmatch.c (rpmatch: try): Take new arg NOMATCH, return value
for nonmatching nonerror (instead of !MATCH).
(rpmatch): Use it, so we return -1 when NOEXPR doesn't match either.
* resolv/getnetnamadr.c (getnetbyaddr): Use u_int32_t instead of
unsigned long for variable NET2.
* time/etcetera, time/europe, time/solar89: Updated from ADO's 96e.
Tue Apr 9 14:37:31 1996 Ulrich Drepper <drepper@cygnus.com>
* catgets/Makefile, catgets/catgets.c, catgets/catgetsinfo.h,
catgets/config.h, catgets/gencat.c, catgets/nl_types.h,
catgets/open_catalog.c: New files. Implementation of XPG4
compliant catgets() function and needed tools.
* Makefile (subdirs): Add catgets.
Thu Apr 18 23:36:11 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* math/Makefile (CPPFLAGS): Append -D__NO_MATH_INLINES.
Wed Apr 10 20:48:43 1996 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/vfprintf.c: Correct some typos.
* sysdeps/libm-ieee754/w_gammaf.c, sysdeps/libm-ieee754/w_lgamma.c,
sysdeps/libm-ieee754/w_lgammaf.c: Reference signgam instead of
__signgam.
Thu Apr 18 21:07:27 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Makerules (no-whole-archive): New variable.
(build-shlib): Use it.
* elf/Makefile (libdl.so): Use it.
* configure.in (libc_cv_ld_no_whole_archive): New check for
--no-whole-archive.
* config.make.in (have-no-whole-archive): New variable.
* stdio-common/printf_fp.c: Increase fudge factor for BIGNUM_SIZE calc
from 3 to 4.
* Make-dist: Include version.mk.
(version, release): Variables removed.
* Makeconfig (version.mk): New target.
Fri Apr 19 01:42:18 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/Makefile (headers): Add langinfo.h.
(CPPFLAGS): Remove -Iliblib.
1996-04-20 00:05:25 +00:00
|
|
|
|
/* The precision comes from a positional parameter. */
|
1996-04-03 16:31:49 +00:00
|
|
|
|
goto do_positional;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
prec = va_arg (ap, int);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* If the precision is negative the precision is omitted. */
|
|
|
|
|
if (prec < 0)
|
|
|
|
|
prec = -1;
|
|
|
|
|
}
|
|
|
|
|
else if (ISDIGIT (*f))
|
|
|
|
|
prec = read_int (&f);
|
|
|
|
|
else
|
|
|
|
|
prec = 0;
|
|
|
|
|
JUMP (*f, step2_jumps);
|
|
|
|
|
|
|
|
|
|
/* Process 'h' modifier. No other modifier is allowed to
|
|
|
|
|
follow. */
|
|
|
|
|
LABEL (mod_half):
|
|
|
|
|
is_short = 1;
|
|
|
|
|
JUMP (*++f, step4_jumps);
|
|
|
|
|
|
|
|
|
|
/* Process 'l' modifier. There might another 'l' follow. */
|
|
|
|
|
LABEL (mod_long):
|
|
|
|
|
is_long = 1;
|
|
|
|
|
JUMP (*++f, step3_jumps);
|
|
|
|
|
|
|
|
|
|
/* Process 'L', 'q', or 'll' modifier. No other modifier is
|
|
|
|
|
allowed to follow. */
|
|
|
|
|
LABEL (mod_longlong):
|
|
|
|
|
is_long_double = 1;
|
|
|
|
|
JUMP (*++f, step4_jumps);
|
|
|
|
|
|
|
|
|
|
LABEL (mod_size_t):
|
|
|
|
|
is_longlong = sizeof (size_t) > sizeof (unsigned long int);
|
|
|
|
|
is_long = sizeof (size_t) > sizeof (unsigned int);
|
|
|
|
|
JUMP (*++f, step4_jumps);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Process current format. */
|
|
|
|
|
while (1)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
1996-04-03 16:31:49 +00:00
|
|
|
|
process_arg (((struct printf_spec *) NULL));
|
|
|
|
|
|
|
|
|
|
LABEL (form_unknown):
|
|
|
|
|
if (spec == L_('\0'))
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 00:37:21 +00:00
|
|
|
|
{
|
|
|
|
|
/* The format string ended before the specifier is complete. */
|
|
|
|
|
funlockfile (s);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
1996-04-03 16:31:49 +00:00
|
|
|
|
|
|
|
|
|
/* If we are in the fast loop force entering the complicated
|
|
|
|
|
one. */
|
|
|
|
|
goto do_positional;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
1996-04-03 16:31:49 +00:00
|
|
|
|
|
|
|
|
|
/* Look for next format specifier. */
|
|
|
|
|
f = find_spec ((end_of_spec = ++f), &mbstate);
|
|
|
|
|
|
|
|
|
|
/* Write the following constant string. */
|
|
|
|
|
outstring (end_of_spec, f - end_of_spec);
|
1995-03-24 07:44:08 +00:00
|
|
|
|
}
|
1996-04-03 16:31:49 +00:00
|
|
|
|
while (*f != L_('\0'));
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 00:37:21 +00:00
|
|
|
|
/* Unlock stream. */
|
|
|
|
|
funlockfile (s);
|
1996-05-12 16:38:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* We processed the whole format without any positional parameters. */
|
|
|
|
|
return done;
|
|
|
|
|
|
|
|
|
|
/* Here starts the more complex loop to handle positional parameters. */
|
|
|
|
|
do_positional:
|
|
|
|
|
{
|
|
|
|
|
/* Array with information about the needed arguments. This has to
|
|
|
|
|
be dynamically extendable. */
|
|
|
|
|
size_t nspecs = 0;
|
|
|
|
|
size_t nspecs_max = 32; /* A more or less arbitrary start value. */
|
|
|
|
|
struct printf_spec *specs
|
|
|
|
|
= alloca (nspecs_max * sizeof (struct printf_spec));
|
|
|
|
|
|
|
|
|
|
/* The number of arguments the format string requests. This will
|
|
|
|
|
determine the size of the array needed to store the argument
|
|
|
|
|
attributes. */
|
|
|
|
|
size_t nargs = 0;
|
|
|
|
|
int *args_type;
|
|
|
|
|
union printf_arg *args_value;
|
|
|
|
|
|
|
|
|
|
/* Positional parameters refer to arguments directly. This could
|
|
|
|
|
also determine the maximum number of arguments. Track the
|
|
|
|
|
maximum number. */
|
|
|
|
|
size_t max_ref_arg = 0;
|
|
|
|
|
|
|
|
|
|
/* Just a counter. */
|
|
|
|
|
int cnt;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (grouping == (const char *) -1)
|
1995-03-24 07:44:08 +00:00
|
|
|
|
{
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* XXX Use wctob. But this is incompatible for now. */
|
|
|
|
|
/* Figure out the thousands separator character. */
|
|
|
|
|
if (mbtowc (&thousands_sep,
|
|
|
|
|
_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
|
|
|
|
|
strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0)
|
|
|
|
|
thousands_sep = (wchar_t) *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
|
|
|
|
|
grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
|
|
|
|
|
if (*grouping == '\0' || *grouping == CHAR_MAX
|
|
|
|
|
|| thousands_sep == L'\0')
|
|
|
|
|
grouping = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
for (f = lead_str_end; *f != '\0'; f = specs[nspecs++].next_fmt)
|
|
|
|
|
{
|
|
|
|
|
if (nspecs >= nspecs_max)
|
|
|
|
|
{
|
|
|
|
|
/* Extend the array of format specifiers. */
|
|
|
|
|
struct printf_spec *old = specs;
|
|
|
|
|
|
|
|
|
|
nspecs_max *= 2;
|
|
|
|
|
specs = alloca (nspecs_max * sizeof (struct printf_spec));
|
|
|
|
|
|
|
|
|
|
if (specs == &old[nspecs])
|
|
|
|
|
/* Stack grows up, OLD was the last thing allocated;
|
|
|
|
|
extend it. */
|
|
|
|
|
nspecs_max += nspecs_max / 2;
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Copy the old array's elements to the new space. */
|
|
|
|
|
memcpy (specs, old, nspecs * sizeof (struct printf_spec));
|
|
|
|
|
if (old == &specs[nspecs])
|
|
|
|
|
/* Stack grows down, OLD was just below the new
|
|
|
|
|
SPECS. We can use that space when the new space
|
|
|
|
|
runs out. */
|
|
|
|
|
nspecs_max += nspecs_max / 2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse the format specifier. */
|
|
|
|
|
nargs += parse_one_spec (f, nargs, &specs[nspecs], &max_ref_arg, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Determine the number of arguments the format string consumes. */
|
|
|
|
|
nargs = MAX (nargs, max_ref_arg);
|
|
|
|
|
|
|
|
|
|
/* Allocate memory for the argument descriptions. */
|
|
|
|
|
args_type = alloca (nargs * sizeof (int));
|
|
|
|
|
memset (args_type, 0, nargs * sizeof (int));
|
|
|
|
|
args_value = alloca (nargs * sizeof (union printf_arg));
|
|
|
|
|
|
|
|
|
|
/* XXX Could do sanity check here: If any element in ARGS_TYPE is
|
|
|
|
|
still zero after this loop, format is invalid. For now we
|
|
|
|
|
simply use 0 as the value. */
|
|
|
|
|
|
|
|
|
|
/* Fill in the types of all the arguments. */
|
|
|
|
|
for (cnt = 0; cnt < nspecs; ++cnt)
|
|
|
|
|
{
|
|
|
|
|
/* If the width is determined by an argument this is an int. */
|
|
|
|
|
if (specs[cnt].width_arg != -1)
|
|
|
|
|
args_type[specs[cnt].width_arg] = PA_INT;
|
|
|
|
|
|
|
|
|
|
/* If the precision is determined by an argument this is an int. */
|
|
|
|
|
if (specs[cnt].prec_arg != -1)
|
|
|
|
|
args_type[specs[cnt].prec_arg] = PA_INT;
|
|
|
|
|
|
|
|
|
|
switch (specs[cnt].ndata_args)
|
|
|
|
|
{
|
|
|
|
|
case 0: /* No arguments. */
|
|
|
|
|
break;
|
|
|
|
|
case 1: /* One argument; we already have the type. */
|
|
|
|
|
args_type[specs[cnt].data_arg] = specs[cnt].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[specs[cnt].info.spec])
|
|
|
|
|
(&specs[cnt].info,
|
|
|
|
|
specs[cnt].ndata_args, &args_type[specs[cnt].data_arg]);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now we know all the types and the order. Fill in the argument
|
|
|
|
|
values. */
|
|
|
|
|
for (cnt = 0, ap = ap_save; cnt < nargs; ++cnt)
|
|
|
|
|
switch (args_type[cnt])
|
|
|
|
|
{
|
1995-03-24 07:44:08 +00:00
|
|
|
|
#define T(tag, mem, type) \
|
1996-04-03 16:31:49 +00:00
|
|
|
|
case tag: \
|
|
|
|
|
args_value[cnt].mem = va_arg (ap, type); \
|
|
|
|
|
break
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
|
|
|
|
T (PA_CHAR, pa_char, int); /* Promoted. */
|
|
|
|
|
T (PA_INT|PA_FLAG_SHORT, pa_short_int, int); /* Promoted. */
|
|
|
|
|
T (PA_INT, pa_int, int);
|
|
|
|
|
T (PA_INT|PA_FLAG_LONG, pa_long_int, long int);
|
|
|
|
|
T (PA_INT|PA_FLAG_LONG_LONG, pa_long_long_int, long long int);
|
|
|
|
|
T (PA_FLOAT, pa_float, double); /* Promoted. */
|
|
|
|
|
T (PA_DOUBLE, pa_double, double);
|
|
|
|
|
T (PA_DOUBLE|PA_FLAG_LONG_DOUBLE, pa_long_double, long double);
|
|
|
|
|
T (PA_STRING, pa_string, const char *);
|
|
|
|
|
T (PA_POINTER, pa_pointer, void *);
|
|
|
|
|
#undef T
|
1996-04-03 16:31:49 +00:00
|
|
|
|
default:
|
|
|
|
|
if ((args_type[cnt] & PA_FLAG_PTR) != 0)
|
|
|
|
|
args_value[cnt].pa_pointer = va_arg (ap, void *);
|
|
|
|
|
else
|
|
|
|
|
args_value[cnt].pa_long_double = 0.0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Now walk through all format specifiers and process them. */
|
|
|
|
|
for (; nspecs_done < nspecs; ++nspecs_done)
|
|
|
|
|
{
|
|
|
|
|
#undef REF
|
|
|
|
|
#define REF(Name) &&do2_##Name
|
|
|
|
|
#undef LABEL
|
|
|
|
|
#define LABEL(Name) do2_##Name
|
|
|
|
|
STEP4_TABLE;
|
|
|
|
|
|
|
|
|
|
int is_negative;
|
|
|
|
|
union
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
1996-04-03 16:31:49 +00:00
|
|
|
|
unsigned long long int longlong;
|
|
|
|
|
unsigned long int word;
|
|
|
|
|
} number;
|
|
|
|
|
int base;
|
|
|
|
|
union printf_arg the_arg;
|
|
|
|
|
char *string; /* Pointer to argument string. */
|
|
|
|
|
|
|
|
|
|
/* Fill variables from values in struct. */
|
|
|
|
|
int alt = specs[nspecs_done].info.alt;
|
|
|
|
|
int space = specs[nspecs_done].info.space;
|
|
|
|
|
int left = specs[nspecs_done].info.left;
|
|
|
|
|
int showsign = specs[nspecs_done].info.showsign;
|
|
|
|
|
int group = specs[nspecs_done].info.group;
|
|
|
|
|
int is_long_double = specs[nspecs_done].info.is_long_double;
|
|
|
|
|
int is_short = specs[nspecs_done].info.is_short;
|
|
|
|
|
int is_long = specs[nspecs_done].info.is_long;
|
|
|
|
|
int width = specs[nspecs_done].info.width;
|
|
|
|
|
int prec = specs[nspecs_done].info.prec;
|
|
|
|
|
char pad = specs[nspecs_done].info.pad;
|
|
|
|
|
CHAR_T spec = specs[nspecs_done].info.spec;
|
|
|
|
|
|
|
|
|
|
/* Fill in last information. */
|
|
|
|
|
if (specs[nspecs_done].width_arg != -1)
|
|
|
|
|
{
|
|
|
|
|
/* Extract the field width from an argument. */
|
|
|
|
|
specs[nspecs_done].info.width =
|
|
|
|
|
args_value[specs[nspecs_done].width_arg].pa_int;
|
|
|
|
|
|
|
|
|
|
if (specs[nspecs_done].info.width < 0)
|
|
|
|
|
/* If the width value is negative left justification is
|
|
|
|
|
selected and the value is taken as being positive. */
|
|
|
|
|
{
|
|
|
|
|
specs[nspecs_done].info.width *= -1;
|
|
|
|
|
left = specs[nspecs_done].info.left = 1;
|
|
|
|
|
}
|
|
|
|
|
width = specs[nspecs_done].info.width;
|
|
|
|
|
}
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
if (specs[nspecs_done].prec_arg != -1)
|
|
|
|
|
{
|
|
|
|
|
/* Extract the precision from an argument. */
|
|
|
|
|
specs[nspecs_done].info.prec =
|
|
|
|
|
args_value[specs[nspecs_done].prec_arg].pa_int;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
if (specs[nspecs_done].info.prec < 0)
|
|
|
|
|
/* If the precision is negative the precision is
|
|
|
|
|
omitted. */
|
|
|
|
|
specs[nspecs_done].info.prec = -1;
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
prec = specs[nspecs_done].info.prec;
|
|
|
|
|
}
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Process format specifiers. */
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
JUMP (spec, step4_jumps);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
process_arg ((&specs[nspecs_done]));
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
LABEL (form_unknown):
|
|
|
|
|
{
|
|
|
|
|
extern printf_function **__printf_function_table;
|
|
|
|
|
int function_done;
|
|
|
|
|
printf_function *function;
|
|
|
|
|
unsigned int i;
|
|
|
|
|
const void **ptr;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
function =
|
|
|
|
|
(__printf_function_table == NULL ? NULL :
|
|
|
|
|
__printf_function_table[specs[nspecs_done].info.spec]);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
if (function == NULL)
|
|
|
|
|
function = &printf_unknown;
|
1995-03-24 07:44:08 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
ptr = alloca (specs[nspecs_done].ndata_args
|
|
|
|
|
* sizeof (const void *));
|
|
|
|
|
|
|
|
|
|
/* Fill in an array of pointers to the argument values. */
|
|
|
|
|
for (i = 0; i < specs[nspecs_done].ndata_args; ++i)
|
|
|
|
|
ptr[i] = &args_value[specs[nspecs_done].data_arg + i];
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Call the function. */
|
|
|
|
|
function_done = (*function) (s, &specs[nspecs_done].info, ptr);
|
|
|
|
|
|
|
|
|
|
/* If an error occured we don't have information about #
|
|
|
|
|
of chars. */
|
|
|
|
|
if (function_done < 0)
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 00:37:21 +00:00
|
|
|
|
{
|
|
|
|
|
funlockfile (s);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
1996-04-03 16:31:49 +00:00
|
|
|
|
|
|
|
|
|
done += function_done;
|
|
|
|
|
}
|
|
|
|
|
break;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
/* Write the following constant string. */
|
|
|
|
|
outstring (specs[nspecs_done].end_of_fmt,
|
|
|
|
|
specs[nspecs_done].next_fmt
|
|
|
|
|
- specs[nspecs_done].end_of_fmt);
|
|
|
|
|
}
|
|
|
|
|
}
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 00:37:21 +00:00
|
|
|
|
/* Unlock the stream. */
|
|
|
|
|
funlockfile (s);
|
1996-05-12 16:38:08 +00:00
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
return done;
|
|
|
|
|
}
|
|
|
|
|
|
1995-11-23 04:53:06 +00:00
|
|
|
|
#ifdef USE_IN_LIBIO
|
Tue Dec 5 02:27:32 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile [routines]: Remove iofscanf, add iopopen, pclose.
* libio/iofscanf.c: Remove file.
* libio/iogetdelim.c (_IO_getdelim): Correct stupid bug at string
termination.
* libio/iopopen.c: New file from GNU libio.
* libio/memstream.c: Fixed bug in fclose handling. Instead of
providing a close callback we need a finish callback.
* libio/pclose.c: New file. Derived from popen.c in GNU libio.
* posix/gnu/types.h: Fixed typo.
* stdio-common/errnobug.c: fputs returns EOF in error case. Do
not test for != 0.
* stdio-common/printf-parse.h (parse_one_spec): Do not force
padding with ' ' if precision is given. Fix by HJ Lu.
* stdio-common/printf_fp.c: Fix comment.
* stdio-common/tfformat.c, stdio-common/tiformat.c,
stdio-common/tstdiomisc.c: New files from GNU libio test suite.
* stdio-common/tstgetln.c: Provide ssize_t type when testing
libio.
* stdio-common/vfprintf.c (outchar): Use PUTC instead of putc.
(vfprintf): Cleasr args_type array before using it.
When printing 0 as an integer with precision 0 nothing must be
written for the number.
Based on patch by HJ Lu.
* stdio-common/vfscanf.c: Remove fixed input buffer. Now we
have a dynamically extended buffer.
* stdlib/strtod.c: Merge with version in Linux libc. This fixes
some bugs with handling of very small numbers and has different
solution for formaer patches.
* sysdeps/i386/i586/add_n.S, sysdeps/i386/i586/sub_n.S: Rename
macros r1 and r2 to t1, and t2 resp. This is necessary because
glibc headers also define r1.
Tue Dec 5 02:27:32 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile [routines]: Remove iofscanf, add iopopen, pclose.
* libio/iofscanf.c: Remove file.
* libio/iogetdelim.c (_IO_getdelim): Correct stupid bug at string
termination.
* libio/iopopen.c: New file from GNU libio.
* libio/memstream.c: Fixed bug in fclose handling. Instead of
providing a close callback we need a finish callback.
* libio/pclose.c: New file. Derived from popen.c in GNU libio.
* posix/gnu/types.h: Fixed typo.
* stdio-common/errnobug.c: fputs returns EOF in error case. Do
not test for != 0.
* stdio-common/printf-parse.h (parse_one_spec): Do not force
padding with ' ' if precision is given. Fix by HJ Lu.
* stdio-common/printf_fp.c: Fix comment.
* stdio-common/tfformat.c, stdio-common/tiformat.c,
stdio-common/tstdiomisc.c: New files from GNU libio test suite.
* stdio-common/tstgetln.c: Provide ssize_t type when testing
libio.
* stdio-common/vfprintf.c (outchar): Use PUTC instead of putc.
(vfprintf): Cleasr args_type array before using it.
When printing 0 as an integer with precision 0 nothing must be
written for the number.
Based on patch by HJ Lu.
* stdio-common/vfscanf.c: Remove fixed input buffer. Now we
have a dynamically extended buffer.
* stdlib/strtod.c: Merge with version in Linux libc. This fixes
some bugs with handling of very small numbers and has different
solution for formaer patches.
* sysdeps/i386/i586/add_n.S, sysdeps/i386/i586/sub_n.S: Rename
macros r1 and r2 to t1, and t2 resp. This is necessary because
glibc headers also define r1.
1995-12-05 03:35:55 +00:00
|
|
|
|
# undef vfprintf
|
|
|
|
|
# ifdef strong_alias
|
|
|
|
|
/* This is for glibc. */
|
1996-04-03 16:31:49 +00:00
|
|
|
|
strong_alias (_IO_vfprintf, vfprintf);
|
Tue Dec 5 02:27:32 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile [routines]: Remove iofscanf, add iopopen, pclose.
* libio/iofscanf.c: Remove file.
* libio/iogetdelim.c (_IO_getdelim): Correct stupid bug at string
termination.
* libio/iopopen.c: New file from GNU libio.
* libio/memstream.c: Fixed bug in fclose handling. Instead of
providing a close callback we need a finish callback.
* libio/pclose.c: New file. Derived from popen.c in GNU libio.
* posix/gnu/types.h: Fixed typo.
* stdio-common/errnobug.c: fputs returns EOF in error case. Do
not test for != 0.
* stdio-common/printf-parse.h (parse_one_spec): Do not force
padding with ' ' if precision is given. Fix by HJ Lu.
* stdio-common/printf_fp.c: Fix comment.
* stdio-common/tfformat.c, stdio-common/tiformat.c,
stdio-common/tstdiomisc.c: New files from GNU libio test suite.
* stdio-common/tstgetln.c: Provide ssize_t type when testing
libio.
* stdio-common/vfprintf.c (outchar): Use PUTC instead of putc.
(vfprintf): Cleasr args_type array before using it.
When printing 0 as an integer with precision 0 nothing must be
written for the number.
Based on patch by HJ Lu.
* stdio-common/vfscanf.c: Remove fixed input buffer. Now we
have a dynamically extended buffer.
* stdlib/strtod.c: Merge with version in Linux libc. This fixes
some bugs with handling of very small numbers and has different
solution for formaer patches.
* sysdeps/i386/i586/add_n.S, sysdeps/i386/i586/sub_n.S: Rename
macros r1 and r2 to t1, and t2 resp. This is necessary because
glibc headers also define r1.
Tue Dec 5 02:27:32 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile [routines]: Remove iofscanf, add iopopen, pclose.
* libio/iofscanf.c: Remove file.
* libio/iogetdelim.c (_IO_getdelim): Correct stupid bug at string
termination.
* libio/iopopen.c: New file from GNU libio.
* libio/memstream.c: Fixed bug in fclose handling. Instead of
providing a close callback we need a finish callback.
* libio/pclose.c: New file. Derived from popen.c in GNU libio.
* posix/gnu/types.h: Fixed typo.
* stdio-common/errnobug.c: fputs returns EOF in error case. Do
not test for != 0.
* stdio-common/printf-parse.h (parse_one_spec): Do not force
padding with ' ' if precision is given. Fix by HJ Lu.
* stdio-common/printf_fp.c: Fix comment.
* stdio-common/tfformat.c, stdio-common/tiformat.c,
stdio-common/tstdiomisc.c: New files from GNU libio test suite.
* stdio-common/tstgetln.c: Provide ssize_t type when testing
libio.
* stdio-common/vfprintf.c (outchar): Use PUTC instead of putc.
(vfprintf): Cleasr args_type array before using it.
When printing 0 as an integer with precision 0 nothing must be
written for the number.
Based on patch by HJ Lu.
* stdio-common/vfscanf.c: Remove fixed input buffer. Now we
have a dynamically extended buffer.
* stdlib/strtod.c: Merge with version in Linux libc. This fixes
some bugs with handling of very small numbers and has different
solution for formaer patches.
* sysdeps/i386/i586/add_n.S, sysdeps/i386/i586/sub_n.S: Rename
macros r1 and r2 to t1, and t2 resp. This is necessary because
glibc headers also define r1.
1995-12-05 03:35:55 +00:00
|
|
|
|
# else
|
|
|
|
|
# if defined __ELF__ || defined __GNU_LIBRARY__
|
|
|
|
|
# include <gnu-stabs.h>
|
|
|
|
|
# ifdef weak_alias
|
|
|
|
|
weak_alias (_IO_vfprintf, vfprintf);
|
|
|
|
|
# endif
|
|
|
|
|
# endif
|
|
|
|
|
# endif
|
1995-11-23 04:53:06 +00:00
|
|
|
|
#endif
|
1996-04-03 16:31:49 +00:00
|
|
|
|
|
1995-03-24 07:44:08 +00:00
|
|
|
|
/* Handle an unknown format specifier. This prints out a canonicalized
|
|
|
|
|
representation of the format spec itself. */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
static int
|
1996-04-03 16:31:49 +00:00
|
|
|
|
printf_unknown (FILE *s, const struct printf_info *info,
|
|
|
|
|
const void *const *args)
|
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
|
|
|
|
int done = 0;
|
1996-04-03 16:31:49 +00:00
|
|
|
|
char work_buffer[BUFSIZ];
|
1995-02-18 01:27:10 +00:00
|
|
|
|
register char *w;
|
|
|
|
|
|
1995-03-24 07:44:08 +00:00
|
|
|
|
outchar ('%');
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
if (info->alt)
|
|
|
|
|
outchar ('#');
|
|
|
|
|
if (info->group)
|
|
|
|
|
outchar ('\'');
|
|
|
|
|
if (info->showsign)
|
|
|
|
|
outchar ('+');
|
|
|
|
|
else if (info->space)
|
|
|
|
|
outchar (' ');
|
|
|
|
|
if (info->left)
|
|
|
|
|
outchar ('-');
|
|
|
|
|
if (info->pad == '0')
|
|
|
|
|
outchar ('0');
|
|
|
|
|
|
1995-03-24 07:44:08 +00:00
|
|
|
|
if (info->width != 0)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
1996-04-03 16:31:49 +00:00
|
|
|
|
w = _itoa_word (info->width, workend + 1, 10, 0);
|
1995-03-24 07:44:08 +00:00
|
|
|
|
while (++w <= workend)
|
|
|
|
|
outchar (*w);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (info->prec != -1)
|
|
|
|
|
{
|
1995-03-24 07:44:08 +00:00
|
|
|
|
outchar ('.');
|
1996-04-03 16:31:49 +00:00
|
|
|
|
w = _itoa_word (info->prec, workend + 1, 10, 0);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
while (++w <= workend)
|
1995-03-24 07:44:08 +00:00
|
|
|
|
outchar (*w);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
1995-03-24 07:44:08 +00:00
|
|
|
|
if (info->spec != '\0')
|
|
|
|
|
outchar (info->spec);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
return done;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Group the digits according to the grouping rules of the current locale.
|
|
|
|
|
The interpretation of GROUPING is as in `struct lconv' from <locale.h>. */
|
|
|
|
|
static char *
|
1996-04-03 16:31:49 +00:00
|
|
|
|
group_number (CHAR_T *w, CHAR_T *rear_ptr, const CHAR_T *grouping,
|
1995-02-18 01:27:10 +00:00
|
|
|
|
wchar_t thousands_sep)
|
|
|
|
|
{
|
|
|
|
|
int len;
|
|
|
|
|
char *src, *s;
|
|
|
|
|
|
|
|
|
|
/* We treat all negative values like CHAR_MAX. */
|
|
|
|
|
|
|
|
|
|
if (*grouping == CHAR_MAX || *grouping < 0)
|
|
|
|
|
/* No grouping should be done. */
|
|
|
|
|
return w;
|
|
|
|
|
|
|
|
|
|
len = *grouping;
|
|
|
|
|
|
|
|
|
|
/* Copy existing string so that nothing gets overwritten. */
|
1996-04-03 16:31:49 +00:00
|
|
|
|
src = (char *) alloca (rear_ptr - w);
|
|
|
|
|
memcpy (src, w + 1, rear_ptr - w);
|
|
|
|
|
s = &src[rear_ptr - w - 1];
|
|
|
|
|
w = rear_ptr;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
/* Process all characters in the string. */
|
|
|
|
|
while (s >= src)
|
|
|
|
|
{
|
|
|
|
|
*w-- = *s--;
|
|
|
|
|
|
|
|
|
|
if (--len == 0 && s >= src)
|
|
|
|
|
{
|
|
|
|
|
/* A new group begins. */
|
|
|
|
|
*w-- = thousands_sep;
|
|
|
|
|
|
|
|
|
|
len = *grouping++;
|
|
|
|
|
if (*grouping == '\0')
|
|
|
|
|
/* The previous grouping repeats ad infinitum. */
|
|
|
|
|
--grouping;
|
|
|
|
|
else if (*grouping == CHAR_MAX || *grouping < 0)
|
|
|
|
|
{
|
|
|
|
|
/* No further grouping to be done.
|
|
|
|
|
Copy the rest of the number. */
|
|
|
|
|
do
|
|
|
|
|
*w-- = *s--;
|
|
|
|
|
while (s >= src);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return w;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#ifdef USE_IN_LIBIO
|
|
|
|
|
/* Helper "class" for `fprintf to unbuffered': creates a temporary buffer. */
|
|
|
|
|
struct helper_file
|
|
|
|
|
{
|
|
|
|
|
struct _IO_FILE_plus _f;
|
|
|
|
|
_IO_FILE *_put_stream;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static int
|
1996-01-19 18:43:03 +00:00
|
|
|
|
_IO_helper_overflow (_IO_FILE *s, int c)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
|
|
|
|
_IO_FILE *target = ((struct helper_file*) s)->_put_stream;
|
|
|
|
|
int used = s->_IO_write_ptr - s->_IO_write_base;
|
|
|
|
|
if (used)
|
|
|
|
|
{
|
|
|
|
|
_IO_size_t written = _IO_sputn (target, s->_IO_write_base, used);
|
|
|
|
|
s->_IO_write_ptr -= written;
|
|
|
|
|
}
|
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
1996-05-09 00:37:21 +00:00
|
|
|
|
return PUTC (c, s);
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct _IO_jump_t _IO_helper_jumps =
|
1996-04-03 16:31:49 +00:00
|
|
|
|
{
|
|
|
|
|
JUMP_INIT_DUMMY,
|
|
|
|
|
JUMP_INIT (finish, _IO_default_finish),
|
|
|
|
|
JUMP_INIT (overflow, _IO_helper_overflow),
|
|
|
|
|
JUMP_INIT (underflow, _IO_default_underflow),
|
|
|
|
|
JUMP_INIT (uflow, _IO_default_uflow),
|
|
|
|
|
JUMP_INIT (pbackfail, _IO_default_pbackfail),
|
|
|
|
|
JUMP_INIT (xsputn, _IO_default_xsputn),
|
|
|
|
|
JUMP_INIT (xsgetn, _IO_default_xsgetn),
|
|
|
|
|
JUMP_INIT (seekoff, _IO_default_seekoff),
|
|
|
|
|
JUMP_INIT (seekpos, _IO_default_seekpos),
|
|
|
|
|
JUMP_INIT (setbuf, _IO_default_setbuf),
|
|
|
|
|
JUMP_INIT (sync, _IO_default_sync),
|
|
|
|
|
JUMP_INIT (doallocate, _IO_default_doallocate),
|
|
|
|
|
JUMP_INIT (read, _IO_default_read),
|
|
|
|
|
JUMP_INIT (write, _IO_default_write),
|
|
|
|
|
JUMP_INIT (seek, _IO_default_seek),
|
|
|
|
|
JUMP_INIT (close, _IO_default_close),
|
|
|
|
|
JUMP_INIT (stat, _IO_default_stat)
|
|
|
|
|
};
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
static int
|
1996-04-03 16:31:49 +00:00
|
|
|
|
buffered_vfprintf (register _IO_FILE *s, const CHAR_T *format,
|
|
|
|
|
_IO_va_list args)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
|
|
|
|
char buf[_IO_BUFSIZ];
|
|
|
|
|
struct helper_file helper;
|
|
|
|
|
register _IO_FILE *hp = (_IO_FILE *) &helper;
|
|
|
|
|
int result, to_flush;
|
|
|
|
|
|
|
|
|
|
/* Initialize helper. */
|
|
|
|
|
helper._put_stream = s;
|
|
|
|
|
hp->_IO_write_base = buf;
|
|
|
|
|
hp->_IO_write_ptr = buf;
|
|
|
|
|
hp->_IO_write_end = buf + sizeof buf;
|
|
|
|
|
hp->_IO_file_flags = _IO_MAGIC|_IO_NO_READS;
|
Sat Nov 18 16:46:01 1995 Ulrich Drepper <drepper@gnu.ai.mit.edu>
* libio/Makefile, libio/cleanup.c, libio/clearerr.c, libio/feof.c,
libio/ferror.c, libio/fgetc.c, libio/filedoalloc.c, libio/fileno.c,
libio/fileops.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofdopen.c, libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofopen.c, libio/iofprintf.c, libio/iofputs.c, libio/iofread.c,
libio/iofscanf.c, libio/iofsetpos.c, libio/ioftell.c, libio/iofwrite.c,
libio/iogetdelim.c, libio/iogetline.c, libio/iogets.c, libio/iolibio.h,
libio/iopadn.c, libio/ioprims.c, libio/ioputs.c, libio/ioseekoff.c,
libio/ioseekpos.c, libio/iosetbuffer.c, libio/iosetvbuf.c,
libio/iosprintf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/iovsscanf.c, libio/libio.h, libio/libioP.h, libio/putc.c,
libio/putchar.c, libio/rewind.c, libio/setbuf.c, libio/setlinebuf.c,
libio/stdfiles.c, libio/stdio.c, libio/stdio.h, libio/strfile.h,
libio/strops.c, libio/vasprintf.c, libio/vscanf.c, libio/vsnprintf.c:
New files. Slightly modified version from Linux libc.
* libio/memstream.c, libio/vdprintf.c: New files for functions not
(yet) part of GNU libio.
* libio/iofopncook.c: Implementation of `fopencookie', mainly written
by Per Bothner.
* stdio-common/getline.c: Adapted to libio.
* stdio-common/snprintf.c: Adapted to libio.
* stdio-common/vfprintf.c: Adapted to libio.
* stdio-common/vfscanf.c: Adapted to libio.
* sysdeps/posix/tempname.c: Adapted to libio.
1995-11-20 03:48:11 +00:00
|
|
|
|
_IO_JUMPS (hp) = (struct _IO_jump_t *) &_IO_helper_jumps;
|
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
/* Now print to helper instead. */
|
|
|
|
|
result = _IO_vfprintf (hp, format, args);
|
|
|
|
|
|
|
|
|
|
/* Now flush anything from the helper to the S. */
|
|
|
|
|
if ((to_flush = hp->_IO_write_ptr - hp->_IO_write_base) > 0)
|
|
|
|
|
{
|
|
|
|
|
if (_IO_sputn (s, hp->_IO_write_base, to_flush) != to_flush)
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#else /* !USE_IN_LIBIO */
|
|
|
|
|
|
|
|
|
|
static int
|
1996-04-03 16:31:49 +00:00
|
|
|
|
buffered_vfprintf (register FILE *s, const CHAR_T *format, va_list args)
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
|
|
|
|
char buf[BUFSIZ];
|
|
|
|
|
int result;
|
|
|
|
|
|
|
|
|
|
s->__bufp = s->__buffer = buf;
|
|
|
|
|
s->__bufsize = sizeof buf;
|
|
|
|
|
s->__put_limit = s->__buffer + s->__bufsize;
|
|
|
|
|
s->__get_limit = s->__buffer;
|
|
|
|
|
|
|
|
|
|
/* Now use buffer to print. */
|
|
|
|
|
result = vfprintf (s, format, args);
|
|
|
|
|
|
|
|
|
|
if (fflush (s) == EOF)
|
1995-03-10 12:38:16 +00:00
|
|
|
|
result = -1;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
s->__buffer = s->__bufp = s->__get_limit = s->__put_limit = NULL;
|
|
|
|
|
s->__bufsize = 0;
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
1996-04-03 16:31:49 +00:00
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
|
/* Pads string with given number of a specified character.
|
|
|
|
|
This code is taken from iopadn.c of the GNU I/O library. */
|
|
|
|
|
#define PADSIZE 16
|
1996-04-03 16:31:49 +00:00
|
|
|
|
static const CHAR_T blanks[PADSIZE] =
|
|
|
|
|
{ L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '),
|
|
|
|
|
L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' '), L_(' ') };
|
|
|
|
|
static const CHAR_T zeroes[PADSIZE] =
|
|
|
|
|
{ L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'),
|
|
|
|
|
L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0'), L_('0') };
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
ssize_t
|
1996-04-03 16:31:49 +00:00
|
|
|
|
#ifndef COMPILE_WPRINTF
|
|
|
|
|
__printf_pad (FILE *s, char pad, size_t count)
|
|
|
|
|
#else
|
|
|
|
|
__wprintf_pad (FILE *s, wchar_t pad, size_t count)
|
|
|
|
|
#endif
|
1995-02-18 01:27:10 +00:00
|
|
|
|
{
|
1996-04-03 16:31:49 +00:00
|
|
|
|
const CHAR_T *padptr;
|
1995-03-24 07:44:08 +00:00
|
|
|
|
register size_t i;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
1996-04-03 16:31:49 +00:00
|
|
|
|
padptr = pad == L_(' ') ? blanks : zeroes;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
|
|
|
|
|
for (i = count; i >= PADSIZE; i -= PADSIZE)
|
1995-03-24 07:44:08 +00:00
|
|
|
|
if (PUT (s, padptr, PADSIZE) != PADSIZE)
|
|
|
|
|
return -1;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
if (i > 0)
|
1995-03-24 07:44:08 +00:00
|
|
|
|
if (PUT (s, padptr, i) != i)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
return count;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
}
|
|
|
|
|
#undef PADSIZE
|
|
|
|
|
#endif /* USE_IN_LIBIO */
|