simplify newline adding

also, account for space for full URL to follow

1 files changed, 11 insertions, 9 deletions

diff --git a/fbench/src/fbench/client.cpp b/fbench/src/fbench/client.cpp
index 5981c2dfcf2..94d0a78631b 100644
--- a/fbench/src/fbench/client.cpp
+++ b/fbench/src/fbench/client.cpp
@@ -122,27 +122,29 @@ int UrlReader::nextContent()
 {
     char *buf = _contentbuf;
     int totLen = 0;
-    int nl = 0;
-    while (totLen + 1 < _contentbufsize) {
-       int left = _contentbufsize - totLen;
+    // make sure we don't chop leftover URL
+    while (totLen + _args._maxLineSize < _contentbufsize) {
        // allow space for newline:
-       int len = _reader.ReadLine(buf, left - 1);
+       int room = _contentbufsize - totLen - 1;
+       int len = _reader.ReadLine(buf, room);
        if (len < 0) {
            // reached EOF
-           return totLen;
+           break;
        }
+       len = std::min(len, room);
        if (len > 0 && buf[0] == '/') {
            // reached next URL
            _leftOvers = buf;
            _leftOversLen = len;
-           return totLen;
+           break;
        }
        buf += len;
+       totLen += len;
        *buf++ = '\n';
-       totLen += nl + len;
-       nl = 1;
+       totLen++;
     }
-    return totLen;
+    // ignore last newline
+    return (totLen > 0) ? totLen-1 : 0;
 }