diff options
Diffstat (limited to 'discover')
-rw-r--r-- | discover/Makefile.am | 5 | ||||
-rw-r--r-- | discover/file.c | 123 | ||||
-rw-r--r-- | discover/file.h | 24 | ||||
-rw-r--r-- | discover/grub2/env.c | 2 | ||||
-rw-r--r-- | discover/network.c | 2 | ||||
-rw-r--r-- | discover/parser.c | 2 |
6 files changed, 3 insertions, 155 deletions
diff --git a/discover/Makefile.am b/discover/Makefile.am index cd5c957..5d0f6e2 100644 --- a/discover/Makefile.am +++ b/discover/Makefile.am @@ -26,8 +26,6 @@ discover_pb_discover_SOURCES = \ discover/discover-server.h \ discover/event.c \ discover/event.h \ - discover/file.c \ - discover/file.h \ discover/params.c \ discover/params.h \ discover/parser.c \ @@ -75,6 +73,3 @@ discover_platform_ro_SOURCES = \ discover_platform_ro_LINK = \ $(LD) -r -o $@ - -EXTRA_DIST += discover/native-parser.c - diff --git a/discover/file.c b/discover/file.c deleted file mode 100644 index 1bde9fb..0000000 --- a/discover/file.c +++ /dev/null @@ -1,123 +0,0 @@ -/* - * 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 <stdlib.h> -#include <errno.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; -} - -static int write_fd(int fd, char *buf, int len) -{ - int i, rc; - - for (i = 0; i < len; i += rc) { - rc = write(fd, buf + i, len - i); - if (rc < 0 && errno != -EINTR) - return rc; - } - - return 0; -} - -int replace_file(const char *filename, char *buf, int len) -{ - char *tempfile; - mode_t oldmask; - int rc, fd; - - tempfile = talloc_asprintf(NULL, "%s.XXXXXX", filename); - - oldmask = umask(0644); - fd = mkstemp(tempfile); - umask(oldmask); - if (fd < 0) { - talloc_free(tempfile); - return fd; - } - - rc = write_fd(fd, buf, len); - if (rc) { - unlink(tempfile); - } else { - rc = rename(tempfile, filename); - } - - talloc_free(tempfile); - - fchmod(fd, 0644); - - close(fd); - return rc; -} diff --git a/discover/file.h b/discover/file.h deleted file mode 100644 index 8aa7d3c..0000000 --- a/discover/file.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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); -int replace_file(const char *filename, char *buf, int len); - -#endif /* FILE_H */ - diff --git a/discover/grub2/env.c b/discover/grub2/env.c index 1c8635f..9de5e9f 100644 --- a/discover/grub2/env.c +++ b/discover/grub2/env.c @@ -3,12 +3,12 @@ #include <string.h> #include <log/log.h> +#include <file/file.h> #include <types/types.h> #include <talloc/talloc.h> #include <util/util.h> #include <discover/parser.h> -#include <discover/file.h> #include "grub2.h" diff --git a/discover/network.c b/discover/network.c index c0bd2af..c9460ac 100644 --- a/discover/network.c +++ b/discover/network.c @@ -11,13 +11,13 @@ #include <log/log.h> #include <list/list.h> +#include <file/file.h> #include <types/types.h> #include <talloc/talloc.h> #include <waiter/waiter.h> #include <process/process.h> #include <system/system.h> -#include "file.h" #include "network.h" #include "sysinfo.h" #include "platform.h" diff --git a/discover/parser.c b/discover/parser.c index 74b2559..7833981 100644 --- a/discover/parser.c +++ b/discover/parser.c @@ -5,6 +5,7 @@ #include <sys/stat.h> #include "types/types.h" +#include <file/file.h> #include <log/log.h> #include <talloc/talloc.h> @@ -12,7 +13,6 @@ #include "parser.h" #include "parser-utils.h" #include "paths.h" -#include "file.h" struct p_item { struct list_item list; |