diff options
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/printf-parse.h | 40 | ||||
| -rw-r--r-- | stdio-common/printf.h | 2 | ||||
| -rw-r--r-- | stdio-common/vfprintf.c | 104 | ||||
| -rw-r--r-- | stdio-common/vfscanf.c | 345 |
4 files changed, 359 insertions, 132 deletions
diff --git a/stdio-common/printf-parse.h b/stdio-common/printf-parse.h index 9a5cfbac7e..86a9821b1f 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 c84978cfc9..71e2d27058 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 50b4f02580..c2324d09a8 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 28f8ceb820..70d8bf0b18 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; |