libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 03:31:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Allow ignoring CR line breaks in SeekableReadStream::readLine()

Browse Source
This commit is contained in:
Cameron Cawley 2020-05-07 21:11:56 +01:00 committed by Eugene Sandulenko
parent 44c0b4644f
commit e207fda7f7
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/stream.cpp
View File

@ -124,7 +124,7 @@ enum {
CR = 0x0D
};
char *SeekableReadStream::readLine(char *buf, size_t bufSize) {
char *SeekableReadStream::readLine(char *buf, size_t bufSize, bool handleCR) {
assert(buf != nullptr && bufSize > 1);
char *p = buf;
size_t len = 0;
@ -159,7 +159,7 @@ char *SeekableReadStream::readLine(char *buf, size_t bufSize) {
// * DOS and Windows use CRLF line breaks
// * Unix and OS X use LF line breaks
// * Macintosh before OS X used CR line breaks
if (c == CR) {
if (c == CR && handleCR) {
// Look at the next char -- is it LF? If not, seek back
c = readByte();
@ -187,12 +187,12 @@ char *SeekableReadStream::readLine(char *buf, size_t bufSize) {
return buf;
}
String SeekableReadStream::readLine() {
String SeekableReadStream::readLine(bool handleCR) {
// Read a line
String line;
while (line.lastChar() != '\n') {
char buf[256];
if (!readLine(buf, 256))
if (!readLine(buf, 256, handleCR))
break;
line += buf;
}

7
common/stream.h
View File

@ -629,9 +629,10 @@ public:
*
* @param s the buffer to store into
* @param bufSize the size of the buffer
* @param handleCR if set (default), then CR and CR/LF are handled as well as LF
* @return a pointer to the read string, or NULL if an error occurred
*/
virtual char *readLine(char *s, size_t bufSize);
virtual char *readLine(char *s, size_t bufSize, bool handleCR = true);
/**
@ -643,8 +644,10 @@ public:
* of the line, *without* the end of a line marker. This method
* does not indicate whether an error occurred. Callers must use
* err() or eos() to determine whether an exception occurred.
*
* @param handleCR if set (default), then CR and CR/LF are handled as well as LF
*/
virtual String readLine();
virtual String readLine(bool handleCR = true);
/**
* Print a hexdump of the stream while maintaing position. The number

4
devtools/create_titanic/zlib.cpp
View File

@ -49,11 +49,11 @@ namespace Common {
*/
void debug(int level, const char *s, ...) {}
char *SeekableReadStream::readLine(char *buf, size_t bufSize) {
char *SeekableReadStream::readLine(char *buf, size_t bufSize, bool handleCR) {
return nullptr;
}
String SeekableReadStream::readLine() {
String SeekableReadStream::readLine(bool handleCR) {
return String();
}