| OLD | NEW | 
|---|
| (Empty) |  | 
|  | 1 #include "stdio_impl.h" | 
|  | 2 #include <errno.h> | 
|  | 3 #include <ctype.h> | 
|  | 4 #include <limits.h> | 
|  | 5 #include <string.h> | 
|  | 6 #include <stdarg.h> | 
|  | 7 #include <wchar.h> | 
|  | 8 #include <inttypes.h> | 
|  | 9 | 
|  | 10 /* Convenient bit representation for modifier flags, which all fall | 
|  | 11  * within 31 codepoints of the space character. */ | 
|  | 12 | 
|  | 13 #define ALT_FORM   (1U<<'#'-' ') | 
|  | 14 #define ZERO_PAD   (1U<<'0'-' ') | 
|  | 15 #define LEFT_ADJ   (1U<<'-'-' ') | 
|  | 16 #define PAD_POS    (1U<<' '-' ') | 
|  | 17 #define MARK_POS   (1U<<'+'-' ') | 
|  | 18 #define GROUPED    (1U<<'\''-' ') | 
|  | 19 | 
|  | 20 #define FLAGMASK (ALT_FORM|ZERO_PAD|LEFT_ADJ|PAD_POS|MARK_POS|GROUPED) | 
|  | 21 | 
|  | 22 #if UINT_MAX == ULONG_MAX | 
|  | 23 #define LONG_IS_INT | 
|  | 24 #endif | 
|  | 25 | 
|  | 26 #if SIZE_MAX != ULONG_MAX || UINTMAX_MAX != ULLONG_MAX | 
|  | 27 #define ODD_TYPES | 
|  | 28 #endif | 
|  | 29 | 
|  | 30 /* State machine to accept length modifiers + conversion specifiers. | 
|  | 31  * Result is 0 on failure, or an argument type to pop on success. */ | 
|  | 32 | 
|  | 33 enum { | 
|  | 34         BARE, LPRE, LLPRE, HPRE, HHPRE, BIGLPRE, | 
|  | 35         ZTPRE, JPRE, | 
|  | 36         STOP, | 
|  | 37         PTR, INT, UINT, ULLONG, | 
|  | 38 #ifndef LONG_IS_INT | 
|  | 39         LONG, ULONG, | 
|  | 40 #else | 
|  | 41 #define LONG INT | 
|  | 42 #define ULONG UINT | 
|  | 43 #endif | 
|  | 44         SHORT, USHORT, CHAR, UCHAR, | 
|  | 45 #ifdef ODD_TYPES | 
|  | 46         LLONG, SIZET, IMAX, UMAX, PDIFF, UIPTR, | 
|  | 47 #else | 
|  | 48 #define LLONG ULLONG | 
|  | 49 #define SIZET ULONG | 
|  | 50 #define IMAX LLONG | 
|  | 51 #define UMAX ULLONG | 
|  | 52 #define PDIFF LONG | 
|  | 53 #define UIPTR ULONG | 
|  | 54 #endif | 
|  | 55         DBL, LDBL, | 
|  | 56         NOARG, | 
|  | 57         MAXSTATE | 
|  | 58 }; | 
|  | 59 | 
|  | 60 #define S(x) [(x)-'A'] | 
|  | 61 | 
|  | 62 static const unsigned char states[]['z'-'A'+1] = { | 
|  | 63         { /* 0: bare types */ | 
|  | 64                 S('d') = INT, S('i') = INT, | 
|  | 65                 S('o') = UINT, S('u') = UINT, S('x') = UINT, S('X') = UINT, | 
|  | 66                 S('e') = DBL, S('f') = DBL, S('g') = DBL, S('a') = DBL, | 
|  | 67                 S('E') = DBL, S('F') = DBL, S('G') = DBL, S('A') = DBL, | 
|  | 68                 S('c') = CHAR, S('C') = INT, | 
|  | 69                 S('s') = PTR, S('S') = PTR, S('p') = UIPTR, S('n') = PTR, | 
|  | 70                 S('m') = NOARG, | 
|  | 71                 S('l') = LPRE, S('h') = HPRE, S('L') = BIGLPRE, | 
|  | 72                 S('z') = ZTPRE, S('j') = JPRE, S('t') = ZTPRE, | 
|  | 73         }, { /* 1: l-prefixed */ | 
|  | 74                 S('d') = LONG, S('i') = LONG, | 
|  | 75                 S('o') = ULONG, S('u') = ULONG, S('x') = ULONG, S('X') = ULONG, | 
|  | 76                 S('c') = INT, S('s') = PTR, S('n') = PTR, | 
|  | 77                 S('l') = LLPRE, | 
|  | 78         }, { /* 2: ll-prefixed */ | 
|  | 79                 S('d') = LLONG, S('i') = LLONG, | 
|  | 80                 S('o') = ULLONG, S('u') = ULLONG, | 
|  | 81                 S('x') = ULLONG, S('X') = ULLONG, | 
|  | 82                 S('n') = PTR, | 
|  | 83         }, { /* 3: h-prefixed */ | 
|  | 84                 S('d') = SHORT, S('i') = SHORT, | 
|  | 85                 S('o') = USHORT, S('u') = USHORT, | 
|  | 86                 S('x') = USHORT, S('X') = USHORT, | 
|  | 87                 S('n') = PTR, | 
|  | 88                 S('h') = HHPRE, | 
|  | 89         }, { /* 4: hh-prefixed */ | 
|  | 90                 S('d') = CHAR, S('i') = CHAR, | 
|  | 91                 S('o') = UCHAR, S('u') = UCHAR, | 
|  | 92                 S('x') = UCHAR, S('X') = UCHAR, | 
|  | 93                 S('n') = PTR, | 
|  | 94         }, { /* 5: L-prefixed */ | 
|  | 95                 S('e') = LDBL, S('f') = LDBL, S('g') = LDBL, S('a') = LDBL, | 
|  | 96                 S('E') = LDBL, S('F') = LDBL, S('G') = LDBL, S('A') = LDBL, | 
|  | 97                 S('n') = PTR, | 
|  | 98         }, { /* 6: z- or t-prefixed (assumed to be same size) */ | 
|  | 99                 S('d') = PDIFF, S('i') = PDIFF, | 
|  | 100                 S('o') = SIZET, S('u') = SIZET, | 
|  | 101                 S('x') = SIZET, S('X') = SIZET, | 
|  | 102                 S('n') = PTR, | 
|  | 103         }, { /* 7: j-prefixed */ | 
|  | 104                 S('d') = IMAX, S('i') = IMAX, | 
|  | 105                 S('o') = UMAX, S('u') = UMAX, | 
|  | 106                 S('x') = UMAX, S('X') = UMAX, | 
|  | 107                 S('n') = PTR, | 
|  | 108         } | 
|  | 109 }; | 
|  | 110 | 
|  | 111 #define OOB(x) ((unsigned)(x)-'A' > 'z'-'A') | 
|  | 112 | 
|  | 113 union arg | 
|  | 114 { | 
|  | 115         uintmax_t i; | 
|  | 116         long double f; | 
|  | 117         void *p; | 
|  | 118 }; | 
|  | 119 | 
|  | 120 static void pop_arg(union arg *arg, int type, va_list *ap) | 
|  | 121 { | 
|  | 122         /* Give the compiler a hint for optimizing the switch. */ | 
|  | 123         if ((unsigned)type > MAXSTATE) return; | 
|  | 124         switch (type) { | 
|  | 125                case PTR:        arg->p = va_arg(*ap, void *); | 
|  | 126         break; case INT:        arg->i = va_arg(*ap, int); | 
|  | 127         break; case UINT:       arg->i = va_arg(*ap, unsigned int); | 
|  | 128 #ifndef LONG_IS_INT | 
|  | 129         break; case LONG:       arg->i = va_arg(*ap, long); | 
|  | 130         break; case ULONG:      arg->i = va_arg(*ap, unsigned long); | 
|  | 131 #endif | 
|  | 132         break; case ULLONG:     arg->i = va_arg(*ap, unsigned long long); | 
|  | 133         break; case SHORT:      arg->i = (short)va_arg(*ap, int); | 
|  | 134         break; case USHORT:     arg->i = (unsigned short)va_arg(*ap, int); | 
|  | 135         break; case CHAR:       arg->i = (signed char)va_arg(*ap, int); | 
|  | 136         break; case UCHAR:      arg->i = (unsigned char)va_arg(*ap, int); | 
|  | 137 #ifdef ODD_TYPES | 
|  | 138         break; case LLONG:      arg->i = va_arg(*ap, long long); | 
|  | 139         break; case SIZET:      arg->i = va_arg(*ap, size_t); | 
|  | 140         break; case IMAX:       arg->i = va_arg(*ap, intmax_t); | 
|  | 141         break; case UMAX:       arg->i = va_arg(*ap, uintmax_t); | 
|  | 142         break; case PDIFF:      arg->i = va_arg(*ap, ptrdiff_t); | 
|  | 143         break; case UIPTR:      arg->i = (uintptr_t)va_arg(*ap, void *); | 
|  | 144 #endif | 
|  | 145         break; case DBL:        arg->f = va_arg(*ap, double); | 
|  | 146         break; case LDBL:       arg->f = va_arg(*ap, long double); | 
|  | 147         } | 
|  | 148 } | 
|  | 149 | 
|  | 150 static void out(FILE *f, const wchar_t *s, size_t l) | 
|  | 151 { | 
|  | 152         while (l-- && !(f->flags & F_ERR)) fputwc(*s++, f); | 
|  | 153 } | 
|  | 154 | 
|  | 155 static int getint(wchar_t **s) { | 
|  | 156         int i; | 
|  | 157         for (i=0; iswdigit(**s); (*s)++) | 
|  | 158                 i = 10*i + (**s-'0'); | 
|  | 159         return i; | 
|  | 160 } | 
|  | 161 | 
|  | 162 static const char sizeprefix['y'-'a'] = { | 
|  | 163 ['a'-'a']='L', ['e'-'a']='L', ['f'-'a']='L', ['g'-'a']='L', | 
|  | 164 ['d'-'a']='j', ['i'-'a']='j', ['o'-'a']='j', ['u'-'a']='j', ['x'-'a']='j', | 
|  | 165 ['p'-'a']='j' | 
|  | 166 }; | 
|  | 167 | 
|  | 168 static int wprintf_core(FILE *f, const wchar_t *fmt, va_list *ap, union arg *nl_
     arg, int *nl_type) | 
|  | 169 { | 
|  | 170         wchar_t *a, *z, *s=(wchar_t *)fmt; | 
|  | 171         unsigned l10n=0, litpct, fl; | 
|  | 172         int w, p; | 
|  | 173         union arg arg; | 
|  | 174         int argpos; | 
|  | 175         unsigned st, ps; | 
|  | 176         int cnt=0, l=0; | 
|  | 177         int i; | 
|  | 178         int t; | 
|  | 179         char *bs; | 
|  | 180         char charfmt[16]; | 
|  | 181         wchar_t wc; | 
|  | 182 | 
|  | 183         for (;;) { | 
|  | 184                 /* Update output count, end loop when fmt is exhausted */ | 
|  | 185                 if (cnt >= 0) { | 
|  | 186                         if (l > INT_MAX - cnt) { | 
|  | 187                                 if (!ferror(f)) errno = EOVERFLOW; | 
|  | 188                                 cnt = -1; | 
|  | 189                         } else cnt += l; | 
|  | 190                 } | 
|  | 191                 if (!*s) break; | 
|  | 192 | 
|  | 193                 /* Handle literal text and %% format specifiers */ | 
|  | 194                 for (a=s; *s && *s!='%'; s++); | 
|  | 195                 litpct = wcsspn(s, L"%")/2; /* Optimize %%%% runs */ | 
|  | 196                 z = s+litpct; | 
|  | 197                 s += 2*litpct; | 
|  | 198                 l = z-a; | 
|  | 199                 if (f) out(f, a, l); | 
|  | 200                 if (l) continue; | 
|  | 201 | 
|  | 202                 if (iswdigit(s[1]) && s[2]=='$') { | 
|  | 203                         l10n=1; | 
|  | 204                         argpos = s[1]-'0'; | 
|  | 205                         s+=3; | 
|  | 206                 } else { | 
|  | 207                         argpos = -1; | 
|  | 208                         s++; | 
|  | 209                 } | 
|  | 210 | 
|  | 211                 /* Read modifier flags */ | 
|  | 212                 for (fl=0; (unsigned)*s-' '<32 && (FLAGMASK&(1U<<*s-' ')); s++) | 
|  | 213                         fl |= 1U<<*s-' '; | 
|  | 214 | 
|  | 215                 /* Read field width */ | 
|  | 216                 if (*s=='*') { | 
|  | 217                         if (iswdigit(s[1]) && s[2]=='$') { | 
|  | 218                                 l10n=1; | 
|  | 219                                 nl_type[s[1]-'0'] = INT; | 
|  | 220                                 w = nl_arg[s[1]-'0'].i; | 
|  | 221                                 s+=3; | 
|  | 222                         } else if (!l10n) { | 
|  | 223                                 w = f ? va_arg(*ap, int) : 0; | 
|  | 224                                 s++; | 
|  | 225                         } else return -1; | 
|  | 226                         if (w<0) fl|=LEFT_ADJ, w=-w; | 
|  | 227                 } else if ((w=getint(&s))<0) return -1; | 
|  | 228 | 
|  | 229                 /* Read precision */ | 
|  | 230                 if (*s=='.' && s[1]=='*') { | 
|  | 231                         if (isdigit(s[2]) && s[3]=='$') { | 
|  | 232                                 nl_type[s[2]-'0'] = INT; | 
|  | 233                                 p = nl_arg[s[2]-'0'].i; | 
|  | 234                                 s+=4; | 
|  | 235                         } else if (!l10n) { | 
|  | 236                                 p = f ? va_arg(*ap, int) : 0; | 
|  | 237                                 s+=2; | 
|  | 238                         } else return -1; | 
|  | 239                 } else if (*s=='.') { | 
|  | 240                         s++; | 
|  | 241                         p = getint(&s); | 
|  | 242                 } else p = -1; | 
|  | 243 | 
|  | 244                 /* Format specifier state machine */ | 
|  | 245                 st=0; | 
|  | 246                 do { | 
|  | 247                         if (OOB(*s)) return -1; | 
|  | 248                         ps=st; | 
|  | 249                         st=states[st]S(*s++); | 
|  | 250                 } while (st-1<STOP); | 
|  | 251                 if (!st) return -1; | 
|  | 252 | 
|  | 253                 /* Check validity of argument type (nl/normal) */ | 
|  | 254                 if (st==NOARG) { | 
|  | 255                         if (argpos>=0) return -1; | 
|  | 256                 } else { | 
|  | 257                         if (argpos>=0) nl_type[argpos]=st, arg=nl_arg[argpos]; | 
|  | 258                         else if (f) pop_arg(&arg, st, ap); | 
|  | 259                         else return 0; | 
|  | 260                 } | 
|  | 261 | 
|  | 262                 if (!f) continue; | 
|  | 263                 t = s[-1]; | 
|  | 264                 if (ps && (t&15)==3) t&=~32; | 
|  | 265 | 
|  | 266                 switch (t) { | 
|  | 267                 case 'n': | 
|  | 268                         switch(ps) { | 
|  | 269                         case BARE: *(int *)arg.p = cnt; break; | 
|  | 270                         case LPRE: *(long *)arg.p = cnt; break; | 
|  | 271                         case LLPRE: *(long long *)arg.p = cnt; break; | 
|  | 272                         case HPRE: *(unsigned short *)arg.p = cnt; break; | 
|  | 273                         case HHPRE: *(unsigned char *)arg.p = cnt; break; | 
|  | 274                         case ZTPRE: *(size_t *)arg.p = cnt; break; | 
|  | 275                         case JPRE: *(uintmax_t *)arg.p = cnt; break; | 
|  | 276                         } | 
|  | 277                         continue; | 
|  | 278                 case 'c': | 
|  | 279                         fputwc(btowc(arg.i), f); | 
|  | 280                         l = 1; | 
|  | 281                         continue; | 
|  | 282                 case 'C': | 
|  | 283                         fputwc(arg.i, f); | 
|  | 284                         l = 1; | 
|  | 285                         continue; | 
|  | 286                 case 'S': | 
|  | 287                         a = arg.p; | 
|  | 288                         z = wmemchr(a, 0, p); | 
|  | 289                         if (z) p=z-a; | 
|  | 290                         if (w<p) w=p; | 
|  | 291                         if (!(fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, ""); | 
|  | 292                         out(f, a, p); | 
|  | 293                         if ((fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, ""); | 
|  | 294                         l=w; | 
|  | 295                         continue; | 
|  | 296                 case 'm': | 
|  | 297                         arg.p = strerror(errno); | 
|  | 298                 case 's': | 
|  | 299                         if (!arg.p) arg.p = "(null)"; | 
|  | 300                         bs = arg.p; | 
|  | 301                         if (p<0) p = INT_MAX; | 
|  | 302                         for (i=l=0; l<p && (i=mbtowc(&wc, bs, MB_LEN_MAX))>0; bs
     +=i, l++); | 
|  | 303                         if (i<0) return -1; | 
|  | 304                         p=l; | 
|  | 305                         if (w<p) w=p; | 
|  | 306                         if (!(fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, ""); | 
|  | 307                         bs = arg.p; | 
|  | 308                         while (l--) { | 
|  | 309                                 i=mbtowc(&wc, bs, MB_LEN_MAX); | 
|  | 310                                 bs+=i; | 
|  | 311                                 fputwc(wc, f); | 
|  | 312                         } | 
|  | 313                         if ((fl&LEFT_ADJ)) fprintf(f, "%.*s", w-p, ""); | 
|  | 314                         l=w; | 
|  | 315                         continue; | 
|  | 316                 } | 
|  | 317 | 
|  | 318                 snprintf(charfmt, sizeof charfmt, "%%%s%s%s%s%s*.*%c%c", | 
|  | 319                         "#"+!(fl & ALT_FORM), | 
|  | 320                         "+"+!(fl & MARK_POS), | 
|  | 321                         "-"+!(fl & LEFT_ADJ), | 
|  | 322                         " "+!(fl & PAD_POS), | 
|  | 323                         "0"+!(fl & ZERO_PAD), | 
|  | 324                         sizeprefix[(t|32)-'a'], t); | 
|  | 325 | 
|  | 326                 switch (t|32) { | 
|  | 327                 case 'a': case 'e': case 'f': case 'g': | 
|  | 328                         l = fprintf(f, charfmt, w, p, arg.f); | 
|  | 329                         break; | 
|  | 330                 case 'd': case 'i': case 'o': case 'u': case 'x': case 'p': | 
|  | 331                         l = fprintf(f, charfmt, w, p, arg.i); | 
|  | 332                         break; | 
|  | 333                 } | 
|  | 334         } | 
|  | 335 | 
|  | 336         if (f) return cnt; | 
|  | 337         if (!l10n) return 0; | 
|  | 338 | 
|  | 339         for (i=1; i<=NL_ARGMAX && nl_type[i]; i++) | 
|  | 340                 pop_arg(nl_arg+i, nl_type[i], ap); | 
|  | 341         for (; i<=NL_ARGMAX && !nl_type[i]; i++); | 
|  | 342         if (i<=NL_ARGMAX) return -1; | 
|  | 343         return 1; | 
|  | 344 } | 
|  | 345 | 
|  | 346 int vfwprintf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap) | 
|  | 347 { | 
|  | 348         va_list ap2; | 
|  | 349         int nl_type[NL_ARGMAX] = {0}; | 
|  | 350         union arg nl_arg[NL_ARGMAX]; | 
|  | 351         int olderr; | 
|  | 352         int ret; | 
|  | 353 | 
|  | 354         /* the copy allows passing va_list* even if va_list is an array */ | 
|  | 355         va_copy(ap2, ap); | 
|  | 356         if (wprintf_core(0, fmt, &ap2, nl_arg, nl_type) < 0) { | 
|  | 357                 va_end(ap2); | 
|  | 358                 return -1; | 
|  | 359         } | 
|  | 360 | 
|  | 361         FLOCK(f); | 
|  | 362         fwide(f, 1); | 
|  | 363         olderr = f->flags & F_ERR; | 
|  | 364         f->flags &= ~F_ERR; | 
|  | 365         ret = wprintf_core(f, fmt, &ap2, nl_arg, nl_type); | 
|  | 366         if (f->flags & F_ERR) ret = -1; | 
|  | 367         f->flags |= olderr; | 
|  | 368         FUNLOCK(f); | 
|  | 369         va_end(ap2); | 
|  | 370         return ret; | 
|  | 371 } | 
| OLD | NEW | 
|---|