<usual/fileutil.h>

diff --git a/include/system.h b/include/system.h
index ced43b8233ed7977f7ec23253a4e8b64ddf93d63..cdb0bd9b58d32078cc560a10073ede0bb7f216de 100644 (file)
--- a/include/system.h
+++ b/include/system.h
@@ -28,7 +28,6 @@
 
 #include <sys/stat.h>
 
-#include <stdio.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <limits.h>

diff --git a/include/util.h b/include/util.h
index d784cf5a0a69602eec5e4e8fe2d5170a420df948..5322800a68685092e648ee3f7f242fdb9c803537 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -16,11 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
- * load file into malloced buffer
- */
-char *load_file(const char *fn) _MUSTCHECK;
-
 /*
  * logging about specific socket
  */

diff --git a/src/loader.c b/src/loader.c
index ebabb00293da8fff8e2e5b16ad7bc70e1376071c..15e5ade6004f0d57ac3a3b2b89552ba85acf2c60 100644 (file)
--- a/src/loader.c
+++ b/src/loader.c
@@ -26,6 +26,8 @@
 #include <netdb.h>
 #endif
 
+#include <usual/fileutil.h>
+
 /*
  * ConnString parsing
  */
@@ -460,7 +462,7 @@ bool load_auth_file(const char *fn)
 {
        char *user, *password, *buf, *p;
 
-       buf = load_file(fn);
+       buf = load_file(fn, NULL);
        if (buf == NULL) {
                /* reset file info */
                auth_loaded(NULL);
@@ -686,7 +688,7 @@ bool iniparser(const char *fn, ConfSection *sect_list, bool reload)
        ConfSection *cur_section = NULL;
        char keybuf[MAX_DBNAME*2];
 
-       buf = load_file(fn);
+       buf = load_file(fn, NULL);
        if (buf == NULL) {
                if (!reload)
                        exit(1);

diff --git a/src/util.c b/src/util.c
index 9e8f5a044925947875b3ef4a40e0cb08cec95120..f330c9f554477767c104f62749a437b93f093386 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -50,50 +50,6 @@ int log_socket_prefix(enum LogLevel lev, void *ctx, char *dst, unsigned int dstl
                        sock, db, user, host, port);
 }
 
-
-/*
- * Load a file into malloc()-ed C string.
- */
-
-char *load_file(const char *fn)
-{
-       struct stat st;
-       char *buf = NULL;
-       int res, fd;
-
-       res = stat(fn, &st);
-       if (res < 0) {
-               log_error("%s: %s", fn, strerror(errno));
-               goto load_error;
-       }
-
-       buf = malloc(st.st_size + 1);
-       if (!buf) {
-               log_error("%s: no mem", fn);
-               goto load_error;
-       }
-
-       if ((fd = open(fn, O_RDONLY)) < 0) {
-               log_error("%s: %s", fn, strerror(errno));
-               goto load_error;
-       }
-
-       if ((res = safe_read(fd, buf, st.st_size)) < 0) {
-               log_error("%s: %s", fn, strerror(errno));
-               goto load_error;
-       }
-
-       close(fd);
-       buf[st.st_size] = 0;
-
-       return buf;
-
-load_error:
-       if (buf != NULL)
-               free(buf);
-       return NULL;
-}
-
 /*
  * PostgreSQL MD5 hashing.
  */