From a70807730ef59efc4116556ecabe1b9f70ce605b Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 8 Aug 2013 14:40:59 +0800 Subject: discover: separate file-reading code into file.c We'll need to read files in the network config code, so add a 'file' object, containing the read_file function. Signed-off-by: Jeremy Kerr --- discover/parser.c | 54 +----------------------------------------------------- 1 file changed, 1 insertion(+), 53 deletions(-) (limited to 'discover/parser.c') diff --git a/discover/parser.c b/discover/parser.c index e2940e1..6896075 100644 --- a/discover/parser.c +++ b/discover/parser.c @@ -12,6 +12,7 @@ #include "parser.h" #include "parser-utils.h" #include "paths.h" +#include "file.h" struct p_item { struct list_item list; @@ -20,59 +21,6 @@ struct p_item { STATIC_LIST(parsers); -static const int max_file_size = 1024 * 1024; - -static int read_file(struct discover_context *ctx, - const char *filename, char **bufp, int *lenp) -{ - struct stat statbuf; - int rc, fd, i, len; - char *buf; - - fd = open(filename, O_RDONLY); - if (fd < 0) - return -1; - - rc = fstat(fd, &statbuf); - if (rc < 0) - goto err_close; - - len = statbuf.st_size; - if (len > max_file_size) - goto err_close; - - buf = talloc_array(ctx, char, len + 1); - if (!buf) - goto err_close; - - for (i = 0; i < len; i += rc) { - rc = read(fd, buf + i, len - i); - - /* unexpected EOF: trim and return */ - if (rc == 0) { - len = i; - break; - } - - if (rc < 0) - goto err_free; - - } - - buf[len] = '\0'; - - close(fd); - *bufp = buf; - *lenp = len; - return 0; - -err_free: - talloc_free(buf); -err_close: - close(fd); - return -1; -} - static char *local_path(struct discover_context *ctx, const char *filename) { -- cgit v1.2.1