From: Jeremy Kerr Date: Wed, 23 Jul 2014 05:47:32 +0000 (+0800) Subject: lib: Move generic file-handling code to lib/ X-Git-Tag: v1.0.0~125 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=052961eb2e8279f103c091e850c317da335c0207 lib: Move generic file-handling code to lib/ Signed-off-by: Jeremy Kerr --- 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 - * - * 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 -#include -#include -#include -#include -#include - -#include - -#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 - * - * 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 #include +#include #include #include #include #include -#include #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 #include +#include #include #include #include #include #include -#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 #include "types/types.h" +#include #include #include @@ -12,7 +13,6 @@ #include "parser.h" #include "parser-utils.h" #include "paths.h" -#include "file.h" struct p_item { struct list_item list; diff --git a/lib/Makefile.am b/lib/Makefile.am index f9f9461..fbf2ee2 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -21,6 +21,8 @@ lib_libpbcore_la_CPPFLAGS = \ -DPREFIX='"$(prefix)"' lib_libpbcore_la_SOURCES = \ + lib/file/file.h \ + lib/file/file.c \ lib/fold/fold.h \ lib/fold/fold.c \ lib/i18n/i18n.h \ @@ -45,4 +47,3 @@ lib_libpbcore_la_SOURCES = \ lib/url/url.h \ lib/util/util.c \ lib/util/util.h - diff --git a/lib/file/file.c b/lib/file/file.c new file mode 100644 index 0000000..1bde9fb --- /dev/null +++ b/lib/file/file.c @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2013 Jeremy Kerr + * + * 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 +#include +#include +#include +#include +#include + +#include + +#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/lib/file/file.h b/lib/file/file.h new file mode 100644 index 0000000..8aa7d3c --- /dev/null +++ b/lib/file/file.h @@ -0,0 +1,24 @@ +/* + * Copyright (C) 2013 Jeremy Kerr + * + * 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 */ +