diff options
| -rw-r--r-- | configd/src/apps/sentinel/line-splitter.cpp | 6 | ||||
| -rw-r--r-- | configd/src/apps/sentinel/line-splitter.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configd/src/apps/sentinel/line-splitter.cpp b/configd/src/apps/sentinel/line-splitter.cpp index 8e990475b99..e52f4e3f33e 100644 --- a/configd/src/apps/sentinel/line-splitter.cpp +++ b/configd/src/apps/sentinel/line-splitter.cpp @@ -71,9 +71,6 @@ LineSplitter::fill() } } else if (readLen == 0) { _eof = true; - if (_buffer[_writePos] != '\n') { - _buffer[_writePos++] = '\n'; // Fake a final separator - } } else { _writePos += readLen; } @@ -90,6 +87,9 @@ LineSplitter::getLine() if (bufLen > 0) { char *start = &_buffer[_readPos]; char *end = static_cast<char *>(memchr(start, '\n', bufLen)); + if (_eof && !end) { + end = &_buffer[_writePos-1]; // pretend last byte sent was \n + } if (end) { *end = '\0'; if (end - start > 0 && end[-1] == '\r') { diff --git a/configd/src/apps/sentinel/line-splitter.h b/configd/src/apps/sentinel/line-splitter.h index 28d183f3e15..5ccf7690fda 100644 --- a/configd/src/apps/sentinel/line-splitter.h +++ b/configd/src/apps/sentinel/line-splitter.h @@ -23,7 +23,7 @@ private: public: explicit LineSplitter(int fd); char *getLine(); - bool eof() const { return _eof; } + bool eof() const { return _eof && _readPos >= _writePos; } ~LineSplitter(); }; |