change uncompresslzma to take a file descriptor

[zpackage] / lib / zpm.c

diff --git a/lib/zpm.c b/lib/zpm.c
index 6827caf629a13693cea6fb3bc73741f5d928b3b3..644dc9729e05ad28682e43e984101d426dd4af2f 100644 (file)
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -258,7 +258,6 @@ static
 #include "newdb.c"
 
 int zpm_db_initialize(struct zpm *pkg) {
-       //fprintf(stderr, "initializing zpm database\n");
        char *error;
        switch (sqlite3_exec(pkg->db, createdb, (int (*)(void *,int,char **,char **))0, NULL, &error)) {
                case SQLITE_OK: break;
@@ -266,6 +265,7 @@ int zpm_db_initialize(struct zpm *pkg) {
                        SQLERROR(sqlite3_errmsg(pkg->db));
                        fprintf(stderr, "error: %s\n", error);
                        sqlite3_free(error);
+                       zpm_rollback(pkg);
                        return 0;
                        break;
        }
@@ -323,6 +323,22 @@ struct zpm *zpm_clearmem(struct zpm *zpm) {
        return zpm;
 }
 
+static void zpm_set_db_errmsg(struct zpm *zpm, const char *msg) {
+       if (zpm) {
+               if (zpm->dberrmsg) {
+                       free(zpm->dberrmsg);
+               }
+               if (msg) {
+                       zpm->dberrmsg = strdup(msg);
+                       if (!zpm->dberrmsg) {
+                               zpm->error = 1;
+                       }
+               } else {
+                       zpm->dberrmsg = 0;
+               }
+       }
+}
+
 int zpm_init(struct zpm *pkg, char *path) {
        int rc;
        sqlite3 *db = 0;
@@ -336,8 +352,15 @@ int zpm_init(struct zpm *pkg, char *path) {
 
        rc = sqlite3_open_v2(path, &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
        if (rc) {
-               SQLERROR(sqlite3_errmsg(db));
-               sqlite3_close(db);
+               pkg->error = 1;
+               pkg->dbresult = rc;
+               zpm_set_db_errmsg(pkg, sqlite3_errstr(rc));
+               if (db) {
+                       sqlite3_close(db);
+               }
+               fprintf(stderr, "error (%d): %s: %s\n", rc,
+                               pkg->dberrmsg ? pkg->dberrmsg : "null", path);
+
                return 0;
        }
        pkg->db   = db;
@@ -424,14 +447,14 @@ int zpm_addvercmp(struct zpm *pkg) {
                        );
 }
 
-int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
+int zpm_extract(struct zpm *pkg, char *hash, char *path, mode_t mode) {
        int rc;
 
        int blobsize;
        //int64_t size;
        void *xzdata;
        int type;
-       FILE *out;
+       int out;
        sqlite3_stmt *ifile;
 
        /* TODO check null */
@@ -484,21 +507,21 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
        blobsize = sqlite3_column_bytes(ifile, 1);
 
        if (strcmp(path, "-")) {
-               out = fopen(path, "w");
+               out = open(path, O_CREAT|O_WRONLY|O_TRUNC, 0600);
        } else {
-               out = stdout;
+               out = 1;
        }
-       if (!out) {
-               fprintf(stderr, "can't open output file %s\n", path);
+       if (out == -1) {
+               fprintf(stderr, "can't open output file %s: %s\n", path,
+                               strerror(errno));
                sqlite3_finalize(ifile);
                sqlite3_close(db);
                return 0;
        }
-       //fwrite(xzdata, blobsize, 1, stdout);
 
        //fprintf(stderr, "uncompressing %d bytes at %p, expect %lld\n", blobsize, xzdata, (long long int)size);
        uncompresslzma(xzdata, blobsize, out);
-       fclose(out);
+       close(out);
        chmod(path, mode);
 
        sqlite3_finalize(ifile);
@@ -541,10 +564,6 @@ static int set_elf_info(sqlite3 *db, char *hash, char *content, size_t length) {
                int rc;
 
                /* clear existing for this hash */
-               if (!run_for_hash(db, "delete from elfinfo where file = ?", hash)) {
-                       SQLERP(db, "error clearing elf info");
-                       return 0;
-               }
 
                if (!run_for_hash(db, "delete from elflibraries where file = ?", hash)) {
                        SQLERP(db, "error clearing elf library");