aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-11-06 04:24:40 +0000
committerUlrich Drepper <drepper@redhat.com>1996-11-06 04:24:40 +0000
commit2c6fe0bd3b270fc644dd4c773f2d47b93f404efe (patch)
treea578bcc93bbeaafacb6012213c458e33b7907528 /stdio-common
parentf5311448f83eada5c5cabf55aae2619dcb1869c0 (diff)
downloadglibc-2c6fe0bd3b270fc644dd4c773f2d47b93f404efe.zip
glibc-2c6fe0bd3b270fc644dd4c773f2d47b93f404efe.tar.gz
glibc-2c6fe0bd3b270fc644dd4c773f2d47b93f404efe.tar.bz2
update from main archive 961105cvs/libc-961106
Wed Nov 6 04:30:26 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/syscalls.list: Add weak alias llseek for _llseek syscall. Reported by Andy Sewell <puck@pookhill.demon.co.uk>. * string/argz.h: Don't protect by __USE_GNU. Tue Nov 5 23:38:28 1996 Ulrich Drepper <drepper@cygnus.com> * Lots of files: Update and reformat copyright. * Makefile (headers): Add xopen_lim.h. * catgets/nl_types.h: Move __BEGIN_DECLS before definition of nl_catd. * grp/grp.h: Define setgrent, getgrent, endgrent, and getgrent_r if __USE_XOPEN_EXTENDED is defined. * pwd/pwd.h: Define setpwent, getpwent, endpwent, and getpwent_r if __USE_XOPEN_EXTENDED is defined. * io/Makefile (routines): Add lchown. * io/sys/poll.h: Add definition of POLLWRNORM. * io/sys/stat.h: Declare lstat, fchmod, mknod when __USE_XOPEN_EXTENDED is defined. * libio/Makefile (routines): Add obprintf. * libio/obprintf.c: New file. * libio/iolibio.h: Add prototypes for _IO_obstack_vprintf and _IO_obstack_printf. * libio/libio.h: Fix typo. * libio/stdio.h: Declare tempnam if __USE_XOPEN_EXTENDED is defined. Add prototypes for obstack_vprintf and obstack_printf. * manual/creature.texi: Describe _XOPEN_SOURCE macro. * manual/intro.texi: Add reference to NSS chapter. * manual/libc.texinfo: Update UPDATED. Comment out `@printindex cp'. It works again. * manual/memory.texi: Add description for obstack_ptr_grow, obstack_int_grow, obstack_ptr_grow_fast, and obstack_int_grow_fast. * manual/nss.texi: Add a few @cindex entries and change NSS_STATUS_* index entries to @vindex. * manual/users.texi: Correct @cindex entry for Netgroup. * math/mathcalls.h: Use __USE_XOPEN and __USE_XOPEN_EXTENDED to make declarations visible for X/Open sources. * misc/search.h: Declare insque/remque only is __USE_SVID or __USE_XOPEN_EXTENDED is defined. * misc/sys/uio.h (readv, writev): Change return value from int to ssize_t. * posix/Makefile (headers): Add re_comp.h. * posix/re_comp.h: New file. XPG interface to regex functions. * posix/getconf.c: Add all names from XPG4.2. * posix/posix1_lim.h: Increase minimum values for _POSIX_CHILD_MAX and _POSIX_OPEN_MAX to minimums from XPG4.2. * sysdeps/generic/confname.h: Add all _SC_* names from XPG4.2. * sysdeps/posix/sysconf.c: Handle new _SC_* values. * sysdeps/stub/sysconf.c: Likewise. * posix/unistd.h: Add declaration of ualarm and lchown. Declare usleep, fchown, fchdir, nice, getpgid, setsid, getsid, setreuid, setregid, vfork, ttyslot, symlink, readlink, gethostid, truncate, ftruncate, getdtablesize, brk, sbrk, lockf when __USE_XOPEN_EXTENDED is defined. * posix/sys/wait.h: Declare wait3 if __USE_XOPEN_EXTENDED is defined. * shadow/shadow.h: Define SHADOW using _PATH_SHADOW. * sysdeps/generic/paths.h: Define _PATH_SHADOW. * sysdeps/unix/sysv/linux/paths.h: Likewise. * signal/signal.h: Declare killpg, sigstack and sigaltstack when __USE_XOPEN_EXTENDED is defined. * stdio/stdio.h: Declare tempnam when __USE_XOPEN is defined. * stdlib/stdlib.h: Make rand48 functions available when __USE_XOPEN is defined. Likewise for valloc, putenv, realpath, [efg]cvt*, and getsubopt functions. * string/string.h: Make memccpy, strdup, bcmp, bcopy, bzero, index, and rindex available when __USE_XOPEN_EXTENDED is defined. * sysdeps/mach/getpagesize.c: De-ANSI-fy. Change return type to int. * sysdeps/posix/getpagesize.c: Likewise. * sysdeps/stub/getpagesize.c: Likewise. * sysdeps/unix/getpagesize.c: Likewise. * time/africa: Update from tzdata1996l. * time/asia: Likewise. * time/australia: Likewise. * time/europe: Likewise. * time/northamerica: Likewise. * time/pacificnew: Likewise. * time/southamerica: Likewise. * time/tzfile.h: Update from tzcode1996m. * time/time.h: Declare strptime if __USE_XOPEN. Declare daylight and timezone also if __USE_XOPEN. * time/sys/time.h: Remove declaration of ualarm. * wctype/wctype.h: Just reference ISO C standard. Tue Nov 5 01:26:32 1996 Richard Henderson <rth@tamu.edu> * crypt/Makefile: Add crypt routines to libc as well iff $(crypt-in-libc) is set. Do this for temporary binary compatibility on existing Linux/Alpha installations. * stdlib/div.c, sysdeps/generic/div.c: Move file to .../generic/. * stdlib/ldiv.c, sysdeps/generic/ldiv.c: Likewise. * stdlib/lldiv.c, sysdeps/generic/lldiv.c: Likewise. * sysdeps/alpha/Makefile (divrem): Add divlu, dviqu, remlu, and remqu. * sysdeps/alpha/div.S: New file. * sysdeps/alpha/ldiv.S: New file. * sysdeps/alpha/lldiv.S: New file. * sysdeps/alpha/divrem.h: Merge signed and unsigned division. Take pointers from Linus and tighten the inner loops a bit. * sysdeps/alpha/divl.S: Change defines for merged routines. * sysdeps/alpha/divq.S: Likewise. * sysdeps/alpha/reml.S: Likewise. * sysdeps/alpha/remq.S: Likewise. * sysdeps/alpha/divlu.S: Remove file. * sysdeps/alpha/divqu.S: Likewise. * sysdeps/alpha/remlu.S: Likewise. * sysdeps/alpha/remqu.S: Likewise. * sysdeps/alpha/bsd-_setjmp.S: If PROF, call _mcount. * sysdeps/alpha/bsd-setjmp.S: Likewise. * sysdeps/alpha/bzero.S: Likewise. * sysdeps/alpha/ffs.S: Likewise. * sysdeps/alpha/htonl.S: Likewise. * sysdeps/alpha/htons.S: Likewise. * sysdeps/alpha/memchr.S: Likewise. * sysdeps/alpha/memset.S: Likewise. * sysdeps/alpha/s_copysign.S: Likewise. * sysdeps/alpha/s_fabs.S: Likewise. * sysdeps/alpha/setjmp.S: Likewise. * sysdeps/alpha/stpcpy.S: Likewise. * sysdeps/alpha/stpncpy.S: Likewise. * sysdeps/alpha/strcat.S: Likewise. * sysdeps/alpha/strchr.S: Likewise. * sysdeps/alpha/strcpy.S: Likewise. * sysdeps/alpha/strlen.S: Likewise. * sysdeps/alpha/strncat.S: Likewise. * sysdeps/alpha/strncpy.S: Likewise. * sysdeps/alpha/strrchr.S: Likewise. * sysdeps/alpha/udiv_qrnnd.S: Likewise. Fix private labels. Convert two small jumps to use conditional moves. * sysdeps/unix/alpha/sysdep.h: Compress all __STDC__ nastiness. (PSEUDO): If PROF, call _mcount. * sysdeps/unix/sysv/linux/alpha/brk.S: If PROF, call _mcount. * sysdeps/unix/sysv/linux/alpha/clone.S: Likewise. * sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S: Likewise. * sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S: Likewise. * sysdeps/unix/sysv/linux/alpha/llseek.S: Likewise. * sysdeps/unix/sysv/linux/alpha/sigsuspend.S: Likewise. * sysdeps/unix/sysv/linux/alpha/syscall.S: Likewise. * sysdeps/alpha/memcpy.S: New file. Odd layout because it should eventually contain memmove as well. * sysdeps/alpha/strcmp.S: New file. * sysdeps/alpha/strncmp.S: New file. * sysdeps/alpha/w_sqrt.S: New file. Tue Nov 5 18:06:06 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/mach/hurd/ttyname_r.c: Use `size_t' for len variable. Tue Nov 5 12:09:29 1996 Ulrich Drepper <drepper@cygnus.com> * sysdep/generic/sysdep.h: Define END only if not yet defined. * sysdep/unix/sysdep.h: Define PSEUDO_END only if not yet defined. Reported by Thomas Bushnell, n/BSG. Mon Nov 4 22:46:53 1996 Ulrich Drepper <drepper@cygnus.com> * manual/users.texi (Netgroup Data): Remove { } around @cindex. Mon Nov 4 19:07:05 1996 Ulrich Drepper <drepper@cygnus.com> * malloc/calloc.c: Check for overflow before trying to allocate memory. Proposed by Neil Matthews <nm@adv.sbc.sony.co.jp>. Fri Nov 1 18:18:32 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * manual/llio.texi (Operating Modes): Add missing arguments to @deftypevr in O_NONBLOCK description. * manual/time.texi (Time Zone Functions): Enclose type name in braces in description of tzname. FIXME: this does not yet work correctly in info. Sun Nov 3 17:29:06 1996 Ulrich Drepper <drepper@cygnus.com> * features.h: Add X/Open macros. * posix/unistd.h: Define X/Open macros. * sysdeps/generic/confname.h: Add _SC_XOPEN_XCU_VERSION, _SC_XOPEN_UNIX, _SC_XOPEN_CRYPT, _SC_XOPEN_ENH_I18N, _SC_XOPEN_SHM, _SC_2_CHAR_TERM, _SC_2_C_VERSION, and _SC_2_UPE. * sysdeps/posix/sysconf.c: Handle new constants. * sysdeps/stub/sysconf.c: Likewise. * sysdeps/unix/sysv/linux/posix_opt.h: Add definition of _XOPEN_SHM. * catgets/catgets.c (catopen): Set errno to ENOMEM when we run out of memory. (catgets): Set errno to EBADF when catalog handle is invalid. Set errno to ENOMSG when translation is not available. (catclose): Set errno to EBADF when catalog handle is invalid. * ctype/ctype.h: Declare isascii and toascii when __USE_XOPEN. Likewise for _toupper and _tolower. * manual/arith.texi: Document strtoq, strtoll, strtouq, strtoull, strtof, and strtold. * manual/math.texi: Document HUGE_VALf and HUGE_VALl. * manual/stdio.h: Document ' flag for numeric formats of scanf. * manual/users.texi: Document that cuserid shouldn't be used. * misc/Makefile (routines): Add dirname. (headers): Add libgen.h. (tests): Add tst-dirname. * misc/dirname.c: New file. * misc/libgen.h: New file. * misc/tst-dirname.c: New file. * misc/search.h: Parameter of hcreate must be of type size_t. * misc/hsearch.c: Likewise. * misc/hsearch_r.c: Likewise for hcreate_r. * misc/search.h: Parameters of insque and remque must be `void *'. * misc/insremque.c: Likewise. * posix/unistd.h: Move declarations of mktemp and mkstemp to... * stdlib/stdlib.h: ...here. * posix/unistd.h [__USE_XOPEN]: Add prototypes for crypt, setkey, encrypt, and swab. * stdio-common/printf-parse.h (struct printf_spec): Add pa_wchar and pa_wstring. (parse_one_spec): Remove Linux compatibility code. Recognize %C and %S formats. * stdio-common/printf.h: Add PA_WCHAR and PA_WSTRING. * stdio-common/vfprintf.c: Add implementation of %C and %S format. * stdio-common/vfscanf.c: Likewise for scanf. * stdlib/l64a.c: Return value for 0 must be the empty string. * stdlib/stdlib.h: Declare reentrant function from rand49 family only if __USE_REENTRANT. Declare rand48 functions also if __USE_XOPEN. * stdlib/strtol.c: Return 0 and set errno to EINVAL when BASE is not a legal value. Return 0 and set errno to EINVAL when strou* sees negativ number. * stdlib/tst-strtol.c: De-ANSI-fy. Change expected results for test of unsigned function and negative input. * string/stratcliff.c: Prevent warnings. * string.h: Move declaration of swab to <unistd.h>. * string/swab.c: De-ANSI-fy. * sysdeps/posix/cuserid.c: Implement using getpwuid_r. * sysdeps/posix/mkstemp.c: Include <stdlib.h> for prototype. * sysdeps/posix/mktemp.c: Likewise. * sysdeps/stub/mkstemp.c: Likewise. * sysdeps/stub/mktemp.c: Likewise. * sysvipc/sys/ipc.h: Prototypes of ftok have to be of types `const char *' and `int'. * sysvipc/ftok.c: Likewise. Make sure only lower 8 bits of PROJ_ID are used. Sun Nov 3 03:21:28 1996 Heiko Schroeder <Heiko.Schroeder@post.rwth-aachen.de> * locale/programs/ld-numeric.c (numeric_output): Compute idx[0] correctly. Sat Nov 2 17:44:32 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/posix/cuserid.c: Use reentrant functions. * manual/users.texi: Tell that cuserid is marked to be withdrawn in XPG4.2. Sat Nov 2 14:26:37 1996 Ulrich Drepper <drepper@cygnus.com> Linus said he will make sure no system call will return a value in -1 ... -4095 as a valid result. * sysdeps/unix/sysv/linux/i386/sysdep.h: Correct test for error. * sysdeps/unix/sysv/linux/i386/syscall.S: Likewise. * sysdeps/unix/sysv/linux/m68k/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/m68k/syscall.S: Likewise. Sat Nov 2 16:54:49 1996 NIIBE Yutaka <gniibe@mri.co.jp> * sysdeps/stub/lockfile.c [!USE_IN_LIBIO]: Define weak alias for __funlockfile, not a circular alias. Define __IO_ftrylockfile if USE_IN_LIBIO and __ftrylockfile if not, not vice versa. * sysdeps/unix/sysv/linux/i386/sysdep.S (__errno_location): Make it a weak symbol. * sysdeps/unix/sysv/linux/m68k/sysdep.S (__errno_location): Likewise. Likewise. * crypt/Makefile (rpath-link): Extend search path to current directory.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/printf-parse.h40
-rw-r--r--stdio-common/printf.h2
-rw-r--r--stdio-common/vfprintf.c104
-rw-r--r--stdio-common/vfscanf.c345
4 files changed, 359 insertions, 132 deletions
diff --git a/stdio-common/printf-parse.h b/stdio-common/printf-parse.h
index 9a5cfba..86a9821 100644
--- a/stdio-common/printf-parse.h
+++ b/stdio-common/printf-parse.h
@@ -1,21 +1,21 @@
/* Internal header for parsing printf format strings.
-Copyright (C) 1995, 1996 Free Software Foundation, Inc.
-This file is part of th GNU C Library.
+ Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ This file is part of th GNU C Library.
-The GNU C Library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Library General Public License as
-published by the Free Software Foundation; either version 2 of the
-License, or (at your option) any later version.
+ The GNU C Library is 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.
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
#include <ctype.h>
#include <printf.h>
@@ -54,6 +54,7 @@ struct printf_spec
union printf_arg
{
unsigned char pa_char;
+ wchar_t pa_wchar;
short int pa_short_int;
int pa_int;
long int pa_long_int;
@@ -66,6 +67,7 @@ union printf_arg
double pa_double;
long double pa_long_double;
const char *pa_string;
+ const wchar_t *pa_wstring;
void *pa_pointer;
};
@@ -300,11 +302,7 @@ parse_one_spec (const UCHAR_T *format, size_t posn, struct printf_spec *spec,
}
/* Get the format specification. */
-#ifdef THIS_IS_INCOMPATIBLE_WITH_LINUX_LIBC
spec->info.spec = (wchar_t) *format++;
-#else
- spec->info.spec = (char) *format++;
-#endif
if (__printf_arginfo_table != NULL &&
__printf_arginfo_table[spec->info.spec] != NULL)
/* We don't try to get the types for all arguments if the format
@@ -346,9 +344,15 @@ parse_one_spec (const UCHAR_T *format, size_t posn, struct printf_spec *spec,
case L'c':
spec->data_arg_type = PA_CHAR;
break;
+ case L'C':
+ spec->data_arg_type = PA_WCHAR;
+ break;
case L's':
spec->data_arg_type = PA_STRING;
break;
+ case L'S':
+ spec->data_arg_type = PA_WSTRING;
+ break;
case L'p':
spec->data_arg_type = PA_POINTER;
break;
diff --git a/stdio-common/printf.h b/stdio-common/printf.h
index c84978c..71e2d27 100644
--- a/stdio-common/printf.h
+++ b/stdio-common/printf.h
@@ -105,7 +105,9 @@ enum
{ /* C type: */
PA_INT, /* int */
PA_CHAR, /* int, cast to char */
+ PA_WCHAR, /* wide char */
PA_STRING, /* const char *, a '\0'-terminated string */
+ PA_WSTRING, /* const wchar_t *, wide character string */
PA_POINTER, /* void * */
PA_FLOAT, /* float */
PA_DOUBLE, /* double */
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 50b4f02..c2324d0 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -1,20 +1,20 @@
/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+ 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 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.
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
#include <ctype.h>
#include <limits.h>
@@ -222,11 +222,11 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
/* '4' */ 8, /* '5' */ 8, /* '6' */ 8, /* '7' */ 8,
/* '8' */ 8, /* '9' */ 8, 0, 0,
0, 0, 0, 0,
- 0, 0, 0, 0,
+ 0, 0, 0, /* 'C' */ 25,
0, /* 'E' */ 19, 0, /* 'G' */ 19,
0, 0, 0, 0,
/* 'L' */ 12, 0, 0, 0,
- 0, 0, 0, 0,
+ 0, 0, 0, /* 'S' */ 21,
0, 0, 0, 0,
/* 'X' */ 18, 0, /* 'Z' */ 13, 0,
0, 0, 0, 0,
@@ -254,7 +254,7 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
#define STEP0_3_TABLE \
/* Step 0: at the beginning. */ \
- static const void *step0_jumps[25] = \
+ static const void *step0_jumps[26] = \
{ \
REF (form_unknown), \
REF (flag_space), /* for ' ' */ \
@@ -277,13 +277,14 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
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_string), /* for 's', 'S' */ \
REF (form_pointer), /* for 'p' */ \
REF (form_number), /* for 'n' */ \
- REF (form_strerror) /* for 'm' */ \
+ REF (form_strerror), /* for 'm' */ \
+ REF (form_wcharacter) /* for 'C' */ \
}; \
/* Step 1: after processing width. */ \
- static const void *step1_jumps[25] = \
+ static const void *step1_jumps[26] = \
{ \
REF (form_unknown), \
REF (form_unknown), /* for ' ' */ \
@@ -306,13 +307,14 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
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_string), /* for 's', 'S' */ \
REF (form_pointer), /* for 'p' */ \
REF (form_number), /* for 'n' */ \
- REF (form_strerror) /* for 'm' */ \
+ REF (form_strerror), /* for 'm' */ \
+ REF (form_wcharacter) /* for 'C' */ \
}; \
/* Step 2: after processing precision. */ \
- static const void *step2_jumps[25] = \
+ static const void *step2_jumps[26] = \
{ \
REF (form_unknown), \
REF (form_unknown), /* for ' ' */ \
@@ -335,13 +337,14 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
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_string), /* for 's', 'S' */ \
REF (form_pointer), /* for 'p' */ \
REF (form_number), /* for 'n' */ \
- REF (form_strerror) /* for 'm' */ \
+ REF (form_strerror), /* for 'm' */ \
+ REF (form_wcharacter) /* for 'C' */ \
}; \
/* Step 3: after processing first 'l' modifier. */ \
- static const void *step3_jumps[25] = \
+ static const void *step3_jumps[26] = \
{ \
REF (form_unknown), \
REF (form_unknown), /* for ' ' */ \
@@ -364,15 +367,16 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
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_string), /* for 's', 'S' */ \
REF (form_pointer), /* for 'p' */ \
REF (form_number), /* for 'n' */ \
- REF (form_strerror) /* for 'm' */ \
+ REF (form_strerror), /* for 'm' */ \
+ REF (form_wcharacter) /* for 'C' */ \
}
#define STEP4_TABLE \
/* Step 4: processing format specifier. */ \
- static const void *step4_jumps[25] = \
+ static const void *step4_jumps[26] = \
{ \
REF (form_unknown), \
REF (form_unknown), /* for ' ' */ \
@@ -395,10 +399,11 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
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_string), /* for 's', 'S' */ \
REF (form_pointer), /* for 'p' */ \
REF (form_number), /* for 'n' */ \
- REF (form_strerror) /* for 'm' */ \
+ REF (form_strerror), /* for 'm' */ \
+ REF (form_wcharacter) /* for 'C' */ \
}
@@ -683,17 +688,38 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
\
LABEL (form_character): \
/* Character. */ \
+ if (is_long) \
+ goto LABEL (form_wcharacter); \
--width; /* Account for the character itself. */ \
if (!left) \
PAD (' '); \
if (fspec == NULL) \
- outchar ((unsigned char) va_arg (ap, int)); /* Promoted. */ \
+ outchar ((unsigned char) va_arg (ap, int)); /* Promoted. */ \
else \
outchar ((unsigned char) args_value[fspec->data_arg].pa_char); \
if (left) \
PAD (' '); \
break; \
\
+ LABEL (form_wcharacter): \
+ { \
+ /* Wide character. */ \
+ char buf[MB_CUR_MAX]; \
+ mbstate_t mbstate; \
+ size_t len; \
+ \
+ len = __wcrtomb (buf, (fspec == NULL ? va_arg (ap, wint_t) \
+ : args_value[fspec->data_arg].pa_wchar), \
+ &mbstate); \
+ width -= len; \
+ if (!left) \
+ PAD (' '); \
+ outstring (buf, len); \
+ if (left) \
+ PAD (' '); \
+ } \
+ break; \
+ \
LABEL (form_string): \
{ \
size_t len; \
@@ -722,18 +748,12 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
len = 0; \
} \
} \
- else if (!is_long) \
+ else if (!is_long && spec != L_('S')) \
{ \
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; \
- } \
+ /* Search for the end of the string, but don't search past \
+ the length specified by the precision. */ \
+ len = strnlen (string, prec); \
else \
len = strlen (string); \
} \
@@ -1176,6 +1196,7 @@ do_positional:
break
T (PA_CHAR, pa_char, int); /* Promoted. */
+ T (PA_WCHAR, pa_wchar, wint_t);
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);
@@ -1184,6 +1205,7 @@ do_positional:
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_WSTRING, pa_wstring, const wchar_t *);
T (PA_POINTER, pa_pointer, void *);
#undef T
default:
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 28f8ceb..70d8bf0 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -1,20 +1,20 @@
/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+ 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 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.
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
-You should have received a copy of the GNU Library General Public
-License along with the GNU C Library; see the file COPYING.LIB. If
-not, write to the Free Software Foundation, Inc., 675 Mass Ave,
-Cambridge, MA 02139, USA. */
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
#include "../locale/localeinfo.h"
#include <errno.h>
@@ -24,6 +24,7 @@ Cambridge, MA 02139, USA. */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <wctype.h>
#include <libc-lock.h>
#ifdef __GNUC__
@@ -55,6 +56,12 @@ Cambridge, MA 02139, USA. */
# define va_list _IO_va_list
# define ungetc(c, s) (--read_in, _IO_ungetc (c, s))
# define inchar() ((c = _IO_getc_unlocked (s)), (void) ++read_in, c)
+# define encode_error() do { \
+ if (errp != NULL) *errp |= 4; \
+ _IO_funlockfile (s); \
+ __set_errno (EILSEQ); \
+ return done; \
+ } while (0)
# define conv_error() do { \
if (errp != NULL) *errp |= 2; \
_IO_funlockfile (s); \
@@ -88,6 +95,11 @@ Cambridge, MA 02139, USA. */
#else
# define ungetc(c, s) (--read_in, ungetc (c, s))
# define inchar() ((c = getc (s)), (void) ++read_in, c)
+# define encode_error() do { \
+ _IO_funlockfile (s); \
+ __set_errno (EILSEQ); \
+ return done; \
+ } while (0)
# define conv_error() do { \
funlockfile (s); \
return done; \
@@ -173,6 +185,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
} num;
/* Character-buffer pointer. */
char *str = NULL;
+ wchar_t *wstr = NULL;
char **strptr = NULL;
size_t strsize = 0;
/* We must not react on white spaces immediately because they can
@@ -435,40 +448,138 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
break;
case 'c': /* Match characters. */
- if (!(flags & SUPPRESS))
+ if ((flags & LONG) == 0)
{
- str = ARG (char *);
- if (str == NULL)
- conv_error ();
- }
+ if (!(flags & SUPPRESS))
+ {
+ str = ARG (char *);
+ if (str == NULL)
+ conv_error ();
+ }
- c = inchar ();
- if (c == EOF)
- input_error ();
+ c = inchar ();
+ if (c == EOF)
+ input_error ();
- if (width == -1)
- width = 1;
+ if (width == -1)
+ width = 1;
- if (!(flags & SUPPRESS))
- {
- do
- *str++ = c;
- while (--width > 0 && inchar () != EOF);
+ if (!(flags & SUPPRESS))
+ {
+ do
+ *str++ = c;
+ while (--width > 0 && inchar () != EOF);
+ }
+ else
+ while (--width > 0 && inchar () != EOF);
+
+ if (width > 0)
+ /* I.e., EOF was read. */
+ --read_in;
+
+ if (!(flags & SUPPRESS))
+ ++done;
+
+ break;
}
- else
- while (--width > 0 && inchar () != EOF);
+ /* FALLTHROUGH */
+ case 'C':
+ /* Get UTF-8 encoded wide character. Here we assume (as in
+ other parts of the libc) that we only have to handle
+ UTF-8. */
+ {
+ wint_t val;
+ size_t cnt = 0;
+ int first = 1;
- if (width > 0)
- /* I.e., EOF was read. */
- --read_in;
+ if (!(flags & SUPPRESS))
+ {
+ wstr = ARG (wchar_t *);
+ if (str == NULL)
+ conv_error ();
+ }
- if (!(flags & SUPPRESS))
- ++done;
+ do
+ {
+#define NEXT_WIDE_CHAR(First) \
+ c = inchar (); \
+ if (c == EOF) \
+ /* EOF is only an error for the first character. */ \
+ if (First) \
+ input_error (); \
+ else \
+ break; \
+ val = c; \
+ if (val >= 0x80) \
+ { \
+ if ((c & 0xc0) == 0x80 || (c & 0xfe) == 0xfe) \
+ encode_error (); \
+ if ((c & 0xe0) == 0xc0) \
+ { \
+ /* We expect two bytes. */ \
+ cnt = 1; \
+ val &= 0x1f; \
+ } \
+ else if ((c & 0xf0) == 0xe0) \
+ { \
+ /* We expect three bytes. */ \
+ cnt = 2; \
+ val &= 0x0f; \
+ } \
+ else if ((c & 0xf8) == 0xf0) \
+ { \
+ /* We expect four bytes. */ \
+ cnt = 3; \
+ val &= 0x07; \
+ } \
+ else if ((c & 0xfc) == 0xf8) \
+ { \
+ /* We expect five bytes. */ \
+ cnt = 4; \
+ val &= 0x03; \
+ } \
+ else \
+ { \
+ /* We expect six bytes. */ \
+ cnt = 5; \
+ val &= 0x01; \
+ } \
+ \
+ do \
+ { \
+ c = inchar (); \
+ if (c == EOF \
+ || (c & 0xc0) == 0x80 || (c & 0xfe) == 0xfe) \
+ encode_error (); \
+ val <<= 6; \
+ val |= c & 0x3f; \
+ } \
+ while (--cnt > 0); \
+ } \
+ \
+ if (!(flags & SUPPRESS)) \
+ *wstr++ = val; \
+ first = 0
+
+ NEXT_WIDE_CHAR (first);
+ }
+ while (--width > 0);
+ if (width > 0)
+ /* I.e., EOF was read. */
+ --read_in;
+
+ if (!(flags & SUPPRESS))
+ ++done;
+ }
break;
case 's': /* Read a string. */
-#define STRING_ARG \
+ if (flags & LONG)
+ /* We have to process a wide character string. */
+ goto wide_char_string;
+
+#define STRING_ARG(Str, Type) \
if (!(flags & SUPPRESS)) \
{ \
if (flags & MALLOC) \
@@ -479,14 +590,15 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
conv_error (); \
/* Allocate an initial buffer. */ \
strsize = 100; \
- *strptr = str = malloc (strsize); \
+ *strptr = malloc (strsize * sizeof (Type)); \
+ Str = (Type *) *strptr; \
} \
else \
- str = ARG (char *); \
- if (str == NULL) \
+ Str = ARG (Type *); \
+ if (Str == NULL) \
conv_error (); \
}
- STRING_ARG;
+ STRING_ARG (str, char);
c = inchar ();
if (c == EOF)
@@ -499,43 +611,44 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
ungetc (c, s);
break;
}
-#define STRING_ADD_CHAR(c) \
+#define STRING_ADD_CHAR(Str, c, Type) \
if (!(flags & SUPPRESS)) \
{ \
- *str++ = c; \
- if ((flags & MALLOC) && str == *strptr + strsize) \
+ *Str++ = c; \
+ if ((flags & MALLOC) && (char *) Str == *strptr + strsize) \
{ \
/* Enlarge the buffer. */ \
- str = realloc (*strptr, strsize * 2); \
- if (str == NULL) \
+ Str = realloc (*strptr, strsize * 2 * sizeof (Type)); \
+ if (Str == NULL) \
{ \
/* Can't allocate that much. Last-ditch effort. */\
- str = realloc (*strptr, strsize + 1); \
- if (str == NULL) \
+ Str = realloc (*strptr, \
+ (strsize + 1) * sizeof (Type)); \
+ if (Str == NULL) \
{ \
/* We lose. Oh well. \
Terminate the string and stop converting, \
so at least we don't skip any input. */ \
- (*strptr)[strsize] = '\0'; \
+ ((Type *) (*strptr))[strsize] = '\0'; \
++done; \
conv_error (); \
} \
else \
{ \
- *strptr = str; \
- str += strsize; \
+ *strptr = (char *) Str; \
+ Str = ((Type *) *strptr) + strsize; \
++strsize; \
} \
} \
else \
{ \
- *strptr = str; \
- str += strsize; \
+ *strptr = (char *) Str; \
+ Str = ((Type *) *strptr) + strsize; \
strsize *= 2; \
} \
} \
}
- STRING_ADD_CHAR (c);
+ STRING_ADD_CHAR (str, c, char);
} while ((width <= 0 || --width > 0) && inchar () != EOF);
if (!(flags & SUPPRESS))
@@ -545,6 +658,43 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
}
break;
+ case 'S':
+ /* Wide character string. */
+ wide_char_string:
+ {
+ wint_t val;
+ int first = 1;
+ STRING_ARG (wstr, wchar_t);
+
+ do
+ {
+ size_t cnt = 0;
+ NEXT_WIDE_CHAR (first);
+
+ if (iswspace (val))
+ {
+ /* XXX We would have to push back the whole wide char
+ with possibly many bytes. But since scanf does
+ not make a difference for white space characters
+ we can simply push back a simple <SP> which is
+ guaranteed to be in the [:space:] class. */
+ ungetc (' ', s);
+ break;
+ }
+
+ STRING_ADD_CHAR (wstr, val, wchar_t);
+ first = 0;
+ }
+ while (width <= 0 || --width > 0);
+
+ if (!(flags & SUPPRESS))
+ {
+ *wstr = L'\0';
+ ++done;
+ }
+ }
+ break;
+
case 'x': /* Hexadecimal integer. */
case 'X': /* Ditto. */
base = 16;
@@ -765,11 +915,19 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
break;
case '[': /* Character class. */
- STRING_ARG;
+ if (flags & LONG)
+ {
+ STRING_ARG (wstr, wchar_t);
+ c = '\0'; /* This is to keep gcc quiet. */
+ }
+ else
+ {
+ STRING_ARG (str, char);
- c = inchar ();
- if (c == EOF)
- input_error ();
+ c = inchar ();
+ if (c == EOF)
+ input_error ();
+ }
if (*f == '^')
{
@@ -814,31 +972,72 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
}
if (fc == '\0')
{
- ungetc (c, s);
+ if (!(flags & LONG))
+ ungetc (c, s);
conv_error();
}
- num.ul = read_in - 1; /* -1 because we already read one char. */
- do
+ if (flags & LONG)
{
- if (wp[c] == not_in)
+ wint_t val;
+ int first = 1;
+
+ do
{
- ungetc (c, s);
- break;
+ size_t cnt = 0;
+ NEXT_WIDE_CHAR (first);
+ if (val > 255 || wp[val] == not_in)
+ {
+ /* XXX We have a problem here. We read a wide
+ character and this possibly took several
+ bytes. But we can only push back one single
+ character. To be sure we don't create wrong
+ input we push it back only in case it is
+ representable within one byte. */
+ if (val < 0x80)
+ ungetc (val, s);
+ break;
+ }
+ STRING_ADD_CHAR (wstr, val, wchar_t);
+ if (width > 0)
+ --width;
+ first = 0;
}
- STRING_ADD_CHAR (c);
- if (width > 0)
- --width;
- }
- while (width != 0 && inchar () != EOF);
+ while (width != 0);
- if (read_in == num.ul)
- conv_error ();
+ if (first)
+ conv_error ();
- if (!(flags & SUPPRESS))
+ if (!(flags & SUPPRESS))
+ {
+ *wstr = L'\0';
+ ++done;
+ }
+ }
+ else
{
- *str = '\0';
- ++done;
+ num.ul = read_in - 1; /* -1 because we already read one char. */
+ do
+ {
+ if (wp[c] == not_in)
+ {
+ ungetc (c, s);
+ break;
+ }
+ STRING_ADD_CHAR (str, c, char);
+ if (width > 0)
+ --width;
+ }
+ while (width != 0 && inchar () != EOF);
+
+ if (read_in == num.ul)
+ conv_error ();
+
+ if (!(flags & SUPPRESS))
+ {
+ *str = '\0';
+ ++done;
+ }
}
break;