diff options
| author | Clifford Wolf <clifford@clifford.at> | 2014-10-23 10:47:21 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2014-10-23 10:58:36 +0200 |
| commit | c5eb5e56b8911bb520a987761739bbb9d9328380 (patch) | |
| tree | 6a578b95c4bc007bb87928df299f90391abfcc07 /kernel/yosys.cc | |
| parent | 750c615e7f01d44db4a7d504024b3681a56d8a78 (diff) | |
| download | yosys-c5eb5e56b8911bb520a987761739bbb9d9328380.tar.gz yosys-c5eb5e56b8911bb520a987761739bbb9d9328380.tar.bz2 yosys-c5eb5e56b8911bb520a987761739bbb9d9328380.zip | |
Re-introduced Yosys::readsome() helper function
(f.read() + f.gcount() made problems with lines > 16kB)
Diffstat (limited to 'kernel/yosys.cc')
| -rw-r--r-- | kernel/yosys.cc | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/kernel/yosys.cc b/kernel/yosys.cc index ad0aa5a6d..d4365ee00 100644 --- a/kernel/yosys.cc +++ b/kernel/yosys.cc @@ -97,6 +97,22 @@ std::string vstringf(const char *fmt, va_list ap) return string; } +int readsome(std::istream &f, char *s, int n) +{ + int rc = f.readsome(s, n); + + // f.readsome() sometimes returns 0 on a non-empty stream.. + if (rc == 0) { + int c = f.get(); + if (c != EOF) { + *s = c; + rc = 1; + } + } + + return rc; +} + std::string next_token(std::string &text, const char *sep) { size_t pos_begin = text.find_first_not_of(sep); |