godzil/ack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved _doscan(); fflush() doesn't call fseek() anymore

Browse Source
This commit is contained in:
eck
1990-04-04 15:52:01 +00:00
parent ad7e46a324
commit d87444a7fb
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lang/cem/libcc.ansi/stdio/doscan.c
View File

@@ -266,7 +266,8 @@ _doscan(register FILE *stream, const char *format, va_list ap)
return done;
}
str = o_collect(ic, stream, kind, width, &base);
if (str < inp_buf) return done;
if (str < inp_buf
|| (str == inp_buf && *str == '-')) return done;
nrchars += str - inp_buf + 1;
if (!(flags & FL_NOASSIGN)) {
if (kind == 'd' || kind == 'i')
@@ -415,7 +416,8 @@ _doscan(register FILE *stream, const char *format, va_list ap)
if (!width) return done;
str = f_collect(ic, stream, width);
if (str < inp_buf) return done;
if (str < inp_buf
|| (str == inp_buf && *str == '-')) return done;
nrchars += str - inp_buf + 1;
if (!(flags & FL_NOASSIGN)) {
ld_val = strtod(inp_buf, &tmp_string);
@@ -433,5 +435,5 @@ _doscan(register FILE *stream, const char *format, va_list ap)
} /* end switch */
++format;
}
return conv ? done : EOF;
return conv || (ic != EOF) ? done : EOF;
}