diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-02-12 02:34:39 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-02-12 02:34:39 -0400 |
| commit | 6f2e3b88649543d625b76ac5542dd8838b28f0b1 (patch) | |
| tree | af76d46718d4b2b3e51c05c3c53a09987505f02f /src/utils.h | |
| parent | 9c9320bc586bc80922921945bfe6bb704c36c624 (diff) | |
| download | fork-ledger-6f2e3b88649543d625b76ac5542dd8838b28f0b1.tar.gz fork-ledger-6f2e3b88649543d625b76ac5542dd8838b28f0b1.tar.bz2 fork-ledger-6f2e3b88649543d625b76ac5542dd8838b28f0b1.zip | |
Properly handle UTF-8 characters in commodity strings.
Diffstat (limited to 'src/utils.h')
| -rw-r--r-- | src/utils.h | 76 |
1 files changed, 39 insertions, 37 deletions
diff --git a/src/utils.h b/src/utils.h index d4011442..93cb9a4a 100644 --- a/src/utils.h +++ b/src/utils.h @@ -546,50 +546,52 @@ inline char * next_element(char * buf, bool variable = false) { inline char peek_next_nonws(std::istream& in) { char c = in.peek(); - while (! in.eof() && std::isspace(c)) { + while (in.good() && ! in.eof() && std::isspace(c)) { in.get(c); c = in.peek(); } return c; } -#define READ_INTO(str, targ, size, var, cond) { \ - char * _p = targ; \ - var = str.peek(); \ - while (! str.eof() && var != '\n' && (cond) && _p - targ < size) { \ - str.get(var); \ - if (str.eof()) \ - break; \ - if (var == '\\') { \ - str.get(var); \ - if (in.eof()) \ - break; \ - } \ - *_p++ = var; \ - var = str.peek(); \ - } \ - *_p = '\0'; \ -} +#define READ_INTO(str, targ, size, var, cond) { \ + char * _p = targ; \ + var = str.peek(); \ + while (str.good() && ! str.eof() && var != '\n' && \ + (cond) && _p - targ < size) { \ + str.get(var); \ + if (str.eof()) \ + break; \ + if (var == '\\') { \ + str.get(var); \ + if (in.eof()) \ + break; \ + } \ + *_p++ = var; \ + var = str.peek(); \ + } \ + *_p = '\0'; \ + } -#define READ_INTO_(str, targ, size, var, idx, cond) { \ - char * _p = targ; \ - var = str.peek(); \ - while (! str.eof() && var != '\n' && (cond) && _p - targ < size) { \ - str.get(var); \ - if (str.eof()) \ - break; \ - idx++; \ - if (var == '\\') { \ - str.get(var); \ - if (in.eof()) \ - break; \ - idx++; \ - } \ - *_p++ = var; \ - var = str.peek(); \ - } \ - *_p = '\0'; \ -} +#define READ_INTO_(str, targ, size, var, idx, cond) { \ + char * _p = targ; \ + var = str.peek(); \ + while (str.good() && ! str.eof() && var != '\n' && \ + (cond) && _p - targ < size) { \ + str.get(var); \ + if (str.eof()) \ + break; \ + idx++; \ + if (var == '\\') { \ + str.get(var); \ + if (in.eof()) \ + break; \ + idx++; \ + } \ + *_p++ = var; \ + var = str.peek(); \ + } \ + *_p = '\0'; \ + } } // namespace ledger |