lib/pattern: Support short repeated read calls when loading from file

[fio.git] / lib / pattern.c

diff --git a/lib/pattern.c b/lib/pattern.c
index 70d0313d237e204c0a49ad0808ad0af170c02d95..d324263c2b347f2c69cb0f0e920b75eb17c8a227 100644 (file)
--- a/lib/pattern.c
+++ b/lib/pattern.c
@@ -32,7 +32,7 @@ static const char *parse_file(const char *beg, char *out,
        const char *end;
        char *file;
        int fd;
-       ssize_t count;
+       ssize_t rc, count = 0;
 
        if (!out_len)
                goto err_out;
@@ -52,9 +52,16 @@ static const char *parse_file(const char *beg, char *out,
                goto err_free_out;
 
        if (out) {
-               count = read(fd, out, out_len);
-               if (count == -1)
-                       goto err_free_close_out;
+               while (1) {
+                       rc = read(fd, out, out_len - count);
+                       if (rc == 0)
+                               break;
+                       if (rc == -1)
+                               goto err_free_close_out;
+
+                       count += rc;
+                       out += rc;
+               }
        } else {
                count = lseek(fd, 0, SEEK_END);
                if (count == -1)