d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
Show stats 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; return done;
} }
str = o_collect(ic, stream, kind, width, &base); 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; nrchars += str - inp_buf + 1;
if (!(flags & FL_NOASSIGN)) { if (!(flags & FL_NOASSIGN)) {
if (kind == 'd' || kind == 'i') if (kind == 'd' || kind == 'i')
@ -415,7 +416,8 @@ _doscan(register FILE *stream, const char *format, va_list ap)
if (!width) return done; if (!width) return done;
str = f_collect(ic, stream, width); 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; nrchars += str - inp_buf + 1;
if (!(flags & FL_NOASSIGN)) { if (!(flags & FL_NOASSIGN)) {
ld_val = strtod(inp_buf, &tmp_string); ld_val = strtod(inp_buf, &tmp_string);
@ -433,5 +435,5 @@ _doscan(register FILE *stream, const char *format, va_list ap)
} /* end switch */ } /* end switch */
++format; ++format;
} }
return conv ? done : EOF; return conv || (ic != EOF) ? done : EOF;
} }

10
lang/cem/libcc.ansi/stdio/fflush.c
View file

@ -27,7 +27,15 @@ fflush(FILE *stream)
&& !io_testflag(stream, _IOWRITING))) && !io_testflag(stream, _IOWRITING)))
return 0; return 0;
if (io_testflag(stream, _IOREADING)) { if (io_testflag(stream, _IOREADING)) {
(void) fseek(stream, 0L, SEEK_CUR); /* (void) fseek(stream, 0L, SEEK_CUR); */
int adjust = 0;
if (stream->_buf && !io_testflag(stream,_IONBF))
adjust = stream->_count;
stream->_count = 0;
_lseek(fileno(stream), (off_t) adjust, SEEK_CUR);
if (io_testflag(stream, _IOWRITE))
stream->_flags &= ~(_IOREADING | _IOWRITING);
stream->_ptr = stream->_buf;
return 0; return 0;
} else if (io_testflag(stream, _IONBF)) return 0; } else if (io_testflag(stream, _IONBF)) return 0;