diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2006-01-08 02:13:29 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2006-01-08 02:13:29 +0000 |
| commit | 7dee7c7984ee944401206e1ad7216f66befcb111 (patch) | |
| tree | 68225c90defb291ee36e763aa709a4f168e86b14 /lib/libc/stdio | |
| parent | e4bab96fd8522d8d4d75953480ab54940cd17856 (diff) | |
Fix the handling of negative hexadecimal numbers in integer formats.
From NetBSD.
Diffstat (limited to 'lib/libc/stdio')
| -rw-r--r-- | lib/libc/stdio/vfscanf.c | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c index 731a892f41f..d7c51be2a76 100644 --- a/lib/libc/stdio/vfscanf.c +++ b/lib/libc/stdio/vfscanf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfscanf.c,v 1.18 2006/01/06 18:53:04 millert Exp $ */ +/* $OpenBSD: vfscanf.c,v 1.19 2006/01/08 02:13:28 millert Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -58,17 +58,18 @@ /* * The following are used in numeric conversions only: - * SIGNOK, NDIGITS, DPTOK, and EXPOK are for floating point; - * SIGNOK, NDIGITS, PFXOK, and NZDIGITS are for integral. + * SIGNOK, HAVESIGN, NDIGITS, DPTOK, and EXPOK are for floating point; + * SIGNOK, HAVESIGN, NDIGITS, PFXOK, and NZDIGITS are for integral. */ #define SIGNOK 0x0200 /* +/- is (still) legal */ -#define NDIGITS 0x0400 /* no digits detected */ +#define HAVESIGN 0x0400 /* sign detected */ +#define NDIGITS 0x0800 /* no digits detected */ -#define DPTOK 0x0800 /* (float) decimal point is still legal */ -#define EXPOK 0x1000 /* (float) exponent (e+3, etc) still legal */ +#define DPTOK 0x1000 /* (float) decimal point is still legal */ +#define EXPOK 0x2000 /* (float) exponent (e+3, etc) still legal */ -#define PFXOK 0x0800 /* 0x prefix is (still) legal */ -#define NZDIGITS 0x1000 /* no zero digits detected */ +#define PFXOK 0x1000 /* 0x prefix is (still) legal */ +#define NZDIGITS 0x2000 /* no zero digits detected */ /* * Conversion types. @@ -500,13 +501,18 @@ literal: case '+': case '-': if (flags & SIGNOK) { flags &= ~SIGNOK; + flags |= HAVESIGN; goto ok; } break; - /* x ok iff flag still set & 2nd char */ + /* + * x ok iff flag still set and 2nd char (or + * 3rd char if we have a sign). + */ case 'x': case 'X': - if (flags & PFXOK && p == buf + 1) { + if (flags & PFXOK && p == + buf + 1 + !!(flags & HAVESIGN)) { base = 16; /* if %i */ flags &= ~PFXOK; goto ok; |