X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=lib%2Fzpm.c;h=11ee22cc36f6768d161b3a334d401d61d52be1c6;hb=8b1e91714de0575adeb202668d7983b7f987afc0;hp=3f1cb2b04060dccc3e6cd15c0351a9256c6e131f;hpb=c907b8ec08b06a4a256fd12b79b4bcf5088fbb19;p=zpackage

diff --git a/lib/zpm.c b/lib/zpm.c
index 3f1cb2b..11ee22c 100644
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -337,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));
@@ -398,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 {
@@ -432,6 +437,7 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, mode_t mode) {
 		}
 	}
 
+	free(tmpfile);
 	return rc;
 }
 
@@ -496,9 +502,9 @@ static int set_elf_info(struct zpm *zpm, char *hash, char *content,
 			if (zpm->error) {
 				return 0;
 			}
-		} else {
-			fprintf(stderr, "can't find soname\n");
 		}
+		/* some dyn don't have an soname, so we don't
+		 * need to warn */
 	}
 
 	/* if exe, set neededs */
@@ -680,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) {