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

diff --git a/lib/zpm.c b/lib/zpm.c
index 3f1cb2b..3cc7632 100644
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -307,11 +307,26 @@ int zpm_close(struct zpm *pkg) {
 
 static int zpm_sqlite_vercmp(void *not_used, int lena, const void *a,
 		int lenb, const void *b) {
-	/* not sure what the ints are, possibly string lengths */
+	int rv;
+	char *bufa, *bufb;
+
 	if (not_used != 0) fprintf(stderr, "sqlite vercmp not_used = %p\n",
 			not_used);
 	if (lena == 0 && lenb > 0) return 1;
-	return zpm_vercmp(a, b);
+	if (lenb == 0 && lena > 0) return -1;
+
+	bufa = sqlite3_malloc(lena+1);
+	bufb = sqlite3_malloc(lenb+1);
+
+	strncpy(bufa, a, lena);
+	strncpy(bufb, b, lenb);
+	bufa[lena] = 0;
+	bufb[lenb] = 0;
+
+	rv = zpm_vercmp(bufa, bufb);
+	sqlite3_free(bufa);
+	sqlite3_free(bufb);
+	return rv;
 }
 
 int zpm_addvercmp(struct zpm *pkg) {
@@ -337,6 +352,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 +417,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 +452,7 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, mode_t mode) {
 		}
 	}
 
+	free(tmpfile);
 	return rc;
 }
 
@@ -496,9 +517,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 +701,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) {