Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

fix 'sscanf' by vitalkrilov

Browse Source 
git-svn-id: svn://kolibrios.org@9529 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA 2021-12-30 16:45:04 +00:00
parent 42909554ba
commit ee947e3840
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
programs/develop/ktcc/trunk/libc.obj/source/stdio/format_scan.c
View File

@ -171,16 +171,25 @@ int try_parse_int(long long *digit, int ch, const void *src, void *save, vir
if (ch == '0') // octal or hex, read next if (ch == '0') // octal or hex, read next
{ {
base = 8;
ch = vgetc(save, src); ch = vgetc(save, src);
if (ch == EOF || isspace(ch)) if (ch == 'c' || ch == 'C')
base = 8;
else if (ch == 'x' || ch == 'X')
base = 16;
if (base == 10)
have_digits++; have_digits++;
else else
if (ch == 'x' || ch == 'X')
{ {
base = 16; char tch = vgetc(save, src);
ch = vgetc(save, src); if ((base == 8 && isdigit(tch) && tch < '8') ||
if (ch == EOF) return EOF; (base == 16 && isxdigit(tch)))
ch = tch;
else
{
have_digits++;
//base = 10; // not required: zero is zero with any (base > 1)
vungetc(save, tch, src);
}
} }
} }
*digit = 0; *digit = 0;
@ -193,7 +202,7 @@ int try_parse_int(long long *digit, int ch, const void *src, void *save, vir
{ {
if (base == 16) if (base == 16)
{ {
if (ch <= '9') ch-= '0'; if (ch <= '9') ch -= '0';
else else
if (ch <= 'F') ch = 10 + ch - 'A'; if (ch <= 'F') ch = 10 + ch - 'A';
else else