From 08fd12511a177cae9a09af9022351a4df153fff9 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Mon, 19 Sep 2016 02:59:17 +0000 Subject: [PATCH] add error reporting to import failures --- lib/zpm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/zpm.c b/lib/zpm.c index 7be8c1e..4ffe0d3 100644 --- a/lib/zpm.c +++ b/lib/zpm.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "zpm.h" @@ -447,19 +448,23 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) { /* mmap the file */ fd = open(path, O_RDONLY); if (fd == -1) { + fprintf(stderr, "%s can't open %s: %s\n", __FUNCTION__, path,strerror(errno)); return 0; } if (fstat(fd, &sbuf) == -1) { + fprintf(stderr, "%s can't fstat %s: %s\n", __FUNCTION__, path,strerror(errno)); return 0; } /* not a regular file? */ if (!S_ISREG(sbuf.st_mode)) { /* TODO this is ok, just stored differently */ + fprintf(stderr, "%s non-regular files unsupported %s\n", __FUNCTION__, path); return 0; } content = mmap(0, sbuf.st_size, PROT_READ,MAP_PRIVATE, fd, 0); if (!content) { + fprintf(stderr, "%s can't mmap %s: %s\n", __FUNCTION__, path,strerror(errno)); return 0; } @@ -473,7 +478,6 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) { hash[64] = 0; fprintf(stderr, "file %s: %s\n", path, hash); - /* prepare and bind */ /* TODO check null */ sqlite3 *db = pkg->db; -- 2.40.0