Ticket #886: read_file-load-directly-to-string.diff

lib/util.cpp

@@ -341 +341 @@
 int read_file_string(const char* path, string& result, size_t max_len, bool tail) {
     result.erase();
     int retval;
-    char* buf;
+    double size;
 
-    retval = read_file_malloc(path, buf, max_len, tail);
+    retval = file_size(path, size);
     if (retval) return retval;
-    result = buf;
-    free(buf);
+
+#ifndef _USING_FCGI_
+    FILE *f = fopen(path, "r");
+#else
+    FCGI_FILE *f = FCGI::fopen(path, "r");
+#endif 
+    if (!f) return ERR_FOPEN;
+
+#ifndef _USING_FCGI_
+    if (max_len && size > max_len) {
+        if (tail) {
+            fseek(f, (long)size-max_len, SEEK_SET);
+        }
+        size = max_len;
+    }
+#endif
+    result.reserve(size);
+    char buf[8192];
+    size_t remain = size, to_read, nread;
+    while (remain > 0) {
+        to_read = sizeof(buf);
+        if (remain < to_read) to_read = remain;
+
+        nread = fread(buf, 1, to_read, f);
+        result.append(buf, nread);
+
+        remain -= nread;
+    }
+    fclose(f);
     return 0;
 }