summaryrefslogtreecommitdiffstats
path: root/discover
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2013-08-08 14:40:59 +0800
committerJeremy Kerr <jk@ozlabs.org>2013-08-08 16:28:39 +0800
commita70807730ef59efc4116556ecabe1b9f70ce605b (patch)
treee23003459b930003ad6ab06f71ac7fb7aa014b1f /discover
parentbee85b3946d50bc4ee02ab889f4b3a9cd0defe98 (diff)
downloadtalos-petitboot-a70807730ef59efc4116556ecabe1b9f70ce605b.tar.gz
talos-petitboot-a70807730ef59efc4116556ecabe1b9f70ce605b.zip
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 <jk@ozlabs.org>
Diffstat (limited to 'discover')
-rw-r--r--discover/Makefile.am2
-rw-r--r--discover/file.c77
-rw-r--r--discover/file.h23
-rw-r--r--discover/parser.c54
4 files changed, 103 insertions, 53 deletions
diff --git a/discover/Makefile.am b/discover/Makefile.am
index e736e93..45b168f 100644
--- a/discover/Makefile.am
+++ b/discover/Makefile.am
@@ -36,6 +36,8 @@ pb_discover_SOURCES = \
event.c \
event.h \
event-parser.c \
+ file.c \
+ file.h \
params.c \
params.h \
parser.c \
diff --git a/discover/file.c b/discover/file.c
new file mode 100644
index 0000000..269421c
--- /dev/null
+++ b/discover/file.c
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2013 Jeremy Kerr <jk@ozlabs.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <talloc/talloc.h>
+
+#include "file.h"
+
+static const int max_file_size = 1024 * 1024;
+
+int read_file(void *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;
+}
diff --git a/discover/file.h b/discover/file.h
new file mode 100644
index 0000000..1997eca
--- /dev/null
+++ b/discover/file.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2013 Jeremy Kerr <jk@ozlabs.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#ifndef FILE_H
+#define FILE_H
+
+int read_file(void *ctx, const char *filename, char **bufp, int *lenp);
+
+#endif /* FILE_H */
+
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)
{
OpenPOWER on IntegriCloud