allow partial hashes in zpm-extract

[zpackage] / lib / zpm.c

diff --git a/lib/zpm.c b/lib/zpm.c
index 55118419b705090d928f280d2842a00ff61d3465..55e2e124b283689e38c2da81bf4b75f24f634b0b 100644 (file)
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -266,6 +266,14 @@ int zpm_open(struct zpm *zpm, char *path) {
 
        zpm_clearmem(zpm);
 
+       if (!path) {
+               path = getenv("ZPMDB");
+       }
+
+       if (!path) {
+               path = "/var/lib/zpm/local.db";
+       }
+
        rc = sqlite3_open_v2(path, &db, SQLITE_OPEN_READWRITE, NULL);
        if (rc) {
                SQLERROR(sqlite3_errmsg(db));
@@ -329,6 +337,10 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, mode_t mode) {
        }
        db = pkg->db;
 
+       if (!path) {
+               path = "-";
+       }
+
        rc = sqlite3_prepare(db, "select size, content from files where hash = ?", -1, &ifile,0);
        if (rc != SQLITE_OK) {
                SQLERROR(sqlite3_errmsg(db));
@@ -390,6 +402,7 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, mode_t mode) {
                                        tmpfile, strerror(errno));
                        sqlite3_finalize(ifile);
                        sqlite3_close(db);
+                       free(tmpfile);
                        return 0;
                }
        } else {
@@ -424,6 +437,7 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, mode_t mode) {
                }
        }
 
+       free(tmpfile);
        return rc;
 }
 
@@ -672,12 +686,14 @@ int zpm_import(struct zpm *zpm, char *path, uint32_t flags, char *hash) {
 
        if (!havedata) {
                /* compress */
+//             fprintf(stderr, "compressing\n");
                outbuf = compresslzma(content, sbuf.st_size, &outlen);
                if (!outbuf) {
                        fprintf(stderr, "compresslzma failed\n");
                        munmap(content, sbuf.st_size);
                        return 0;
                }
+////           fprintf(stderr, "compress finished\n");
 
                /* insert */
                if (haverow) {