+/* $NetBSD: fmtcheck.c,v 1.8 2008/04/28 20:22:59 martin Exp $ */
+
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* POSSIBILITY OF SUCH DAMAGE.
*/
-/* $NetBSD: fmtcheck.c,v 1.2 2000/11/01 01:17:20 briggs Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/fmtcheck.c,v 1.7 2004/05/02 10:55:05 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/fmtcheck.c,v 1.10 2009/06/23 23:52:12 delphij Exp $");
#include <stdio.h>
#include <string.h>
FMTCHECK_START,
FMTCHECK_SHORT,
FMTCHECK_INT,
+ FMTCHECK_WINTT,
FMTCHECK_LONG,
FMTCHECK_QUAD,
+ FMTCHECK_INTMAXT,
FMTCHECK_PTRDIFFT,
FMTCHECK_SIZET,
+ FMTCHECK_CHARPOINTER,
FMTCHECK_SHORTPOINTER,
FMTCHECK_INTPOINTER,
FMTCHECK_LONGPOINTER,
FMTCHECK_QUADPOINTER,
+ FMTCHECK_INTMAXTPOINTER,
FMTCHECK_PTRDIFFTPOINTER,
FMTCHECK_SIZETPOINTER,
#ifndef NO_FLOATING_POINT
FMTCHECK_LONGDOUBLE,
#endif
FMTCHECK_STRING,
+ FMTCHECK_WSTRING,
FMTCHECK_WIDTH,
FMTCHECK_PRECISION,
FMTCHECK_DONE,
};
typedef enum __e_fmtcheck_types EFT;
+enum e_modifier {
+ MOD_NONE,
+ MOD_CHAR,
+ MOD_SHORT,
+ MOD_LONG,
+ MOD_QUAD,
+ MOD_INTMAXT,
+ MOD_LONGDOUBLE,
+ MOD_PTRDIFFT,
+ MOD_SIZET,
+};
+
#define RETURN(pf,f,r) do { \
*(pf) = (f); \
return r; \
static EFT
get_next_format_from_precision(const char **pf)
{
- int sh, lg, quad, longdouble, ptrdifft, sizet;
+ enum e_modifier modifier;
const char *f;
- sh = lg = quad = longdouble = ptrdifft = sizet = 0;
-
f = *pf;
switch (*f) {
case 'h':
f++;
- sh = 1;
+ if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN);
+ if (*f == 'h') {
+ f++;
+ modifier = MOD_CHAR;
+ } else {
+ modifier = MOD_SHORT;
+ }
+ break;
+ case 'j':
+ f++;
+ modifier = MOD_INTMAXT;
break;
case 'l':
f++;
if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN);
if (*f == 'l') {
f++;
- quad = 1;
+ modifier = MOD_QUAD;
} else {
- lg = 1;
+ modifier = MOD_LONG;
}
break;
case 'q':
f++;
- quad = 1;
+ modifier = MOD_QUAD;
break;
case 't':
f++;
- ptrdifft = 1;
+ modifier = MOD_PTRDIFFT;
break;
case 'z':
f++;
- sizet = 1;
+ modifier = MOD_SIZET;
break;
case 'L':
f++;
- longdouble = 1;
+ modifier = MOD_LONGDOUBLE;
break;
default:
+ modifier = MOD_NONE;
break;
}
if (!*f) RETURN(pf,f,FMTCHECK_UNKNOWN);
if (strchr("diouxX", *f)) {
- if (longdouble)
- RETURN(pf,f,FMTCHECK_UNKNOWN);
- if (lg)
+ switch (modifier) {
+ case MOD_LONG:
RETURN(pf,f,FMTCHECK_LONG);
- if (quad)
+ case MOD_QUAD:
RETURN(pf,f,FMTCHECK_QUAD);
- if (ptrdifft)
+ case MOD_INTMAXT:
+ RETURN(pf,f,FMTCHECK_INTMAXT);
+ case MOD_PTRDIFFT:
RETURN(pf,f,FMTCHECK_PTRDIFFT);
- if (sizet)
+ case MOD_SIZET:
RETURN(pf,f,FMTCHECK_SIZET);
- RETURN(pf,f,FMTCHECK_INT);
+ case MOD_CHAR:
+ case MOD_SHORT:
+ case MOD_NONE:
+ RETURN(pf,f,FMTCHECK_INT);
+ default:
+ RETURN(pf,f,FMTCHECK_UNKNOWN);
+ }
}
if (*f == 'n') {
- if (longdouble)
- RETURN(pf,f,FMTCHECK_UNKNOWN);
- if (sh)
+ switch (modifier) {
+ case MOD_CHAR:
+ RETURN(pf,f,FMTCHECK_CHARPOINTER);
+ case MOD_SHORT:
RETURN(pf,f,FMTCHECK_SHORTPOINTER);
- if (lg)
+ case MOD_LONG:
RETURN(pf,f,FMTCHECK_LONGPOINTER);
- if (quad)
+ case MOD_QUAD:
RETURN(pf,f,FMTCHECK_QUADPOINTER);
- if (ptrdifft)
+ case MOD_INTMAXT:
+ RETURN(pf,f,FMTCHECK_INTMAXTPOINTER);
+ case MOD_PTRDIFFT:
RETURN(pf,f,FMTCHECK_PTRDIFFTPOINTER);
- if (sizet)
+ case MOD_SIZET:
RETURN(pf,f,FMTCHECK_SIZETPOINTER);
- RETURN(pf,f,FMTCHECK_INTPOINTER);
+ case MOD_NONE:
+ RETURN(pf,f,FMTCHECK_INTPOINTER);
+ default:
+ RETURN(pf,f,FMTCHECK_UNKNOWN);
+ }
}
if (strchr("DOU", *f)) {
- if (sh + lg + quad + longdouble + ptrdifft + sizet)
+ if (modifier != MOD_NONE)
RETURN(pf,f,FMTCHECK_UNKNOWN);
RETURN(pf,f,FMTCHECK_LONG);
}
#ifndef NO_FLOATING_POINT
if (strchr("aAeEfFgG", *f)) {
- if (longdouble)
+ switch (modifier) {
+ case MOD_LONGDOUBLE:
RETURN(pf,f,FMTCHECK_LONGDOUBLE);
- if (sh + lg + quad + ptrdifft + sizet)
+ case MOD_LONG:
+ case MOD_NONE:
+ RETURN(pf,f,FMTCHECK_DOUBLE);
+ default:
RETURN(pf,f,FMTCHECK_UNKNOWN);
- RETURN(pf,f,FMTCHECK_DOUBLE);
+ }
}
#endif
if (*f == 'c') {
- if (sh + lg + quad + longdouble + ptrdifft + sizet)
+ switch (modifier) {
+ case MOD_LONG:
+ RETURN(pf,f,FMTCHECK_WINTT);
+ case MOD_NONE:
+ RETURN(pf,f,FMTCHECK_INT);
+ default:
RETURN(pf,f,FMTCHECK_UNKNOWN);
- RETURN(pf,f,FMTCHECK_INT);
+ }
+ }
+ if (*f == 'C') {
+ if (modifier != MOD_NONE)
+ RETURN(pf,f,FMTCHECK_UNKNOWN);
+ RETURN(pf,f,FMTCHECK_WINTT);
}
if (*f == 's') {
- if (sh + lg + quad + longdouble + ptrdifft + sizet)
+ switch (modifier) {
+ case MOD_LONG:
+ RETURN(pf,f,FMTCHECK_WSTRING);
+ case MOD_NONE:
+ RETURN(pf,f,FMTCHECK_STRING);
+ default:
+ RETURN(pf,f,FMTCHECK_UNKNOWN);
+ }
+ }
+ if (*f == 'S') {
+ if (modifier != MOD_NONE)
RETURN(pf,f,FMTCHECK_UNKNOWN);
- RETURN(pf,f,FMTCHECK_STRING);
+ RETURN(pf,f,FMTCHECK_WSTRING);
}
if (*f == 'p') {
- if (sh + lg + quad + longdouble + ptrdifft + sizet)
+ if (modifier != MOD_NONE)
RETURN(pf,f,FMTCHECK_UNKNOWN);
RETURN(pf,f,FMTCHECK_LONG);
}
}
/* Eat any of the flags */
- while (*f && (strchr("#0- +", *f)))
+ while (*f && (strchr("#'0- +", *f)))
f++;
if (*f == '*') {
/*NOTREACHED*/
}
-__const char *
+const char *
__fmtcheck(const char *f1, const char *f2)
{
const char *f1p, *f2p;