X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=lib%2Fzpm.c;h=68d6fb9aabd44d134fc83ffa8145118e0b93a23b;hb=7cc581729bb4b242c803299f72eed987b9fee216;hp=8e0687542c290f49dbdf0298045a0bb67a158cd1;hpb=c3a6daeacf5c6873cec41fa35ef5b917d335ad6a;p=zpackage

diff --git a/lib/zpm.c b/lib/zpm.c
index 8e06875..68d6fb9 100644
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -354,12 +354,12 @@ int zpm_close(struct zpm *pkg) {
 	return 1;
 }
 
-static int zpm_sqlite_vercmp(void *not_used, int unknown, const void *a,
-		int unk2, const void *b) {
+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 */
-	not_used = 0; /* suppress warning */
-	unknown = 0; /* suppress warning */
-	unk2 = 0;
+	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);
 }
 
@@ -425,7 +425,7 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
 		/* didn't find a row */
 		sqlite3_finalize(ifile);
 		sqlite3_close(db);
-		fprintf(stderr, "no such hash\n");
+		fprintf(stderr, "no such hash: %s\n", hash);
 		return 0;
 	}
 	/* either way we're done with this now */
@@ -478,51 +478,6 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
 	return 1;
 }
 
-/* flags 0, close mmap, flags 1, return mmap fd */
-int zpm_hash(char *path, char *hash, uint32_t flags) {
-	int fd;
-	void *content;
-	struct stat sbuf;
-	hash_state md;
-	int j;
-	unsigned char tmp[32];
-
-	/* 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);
-	close(fd);
-	if (!content) {
-		fprintf(stderr, "%s can't mmap %s: %s\n", __FUNCTION__, path,strerror(errno));
-		return 0;
-	}
-
-	/* get hash */
-	sha256_init(&md);
-	sha256_process(&md, content, sbuf.st_size);
-	sha256_done(&md, tmp);
-	for (j=0;j<32;j++) {
-		sprintf(hash+j*2, "%02x", (unsigned)tmp[j]);
-	}
-	hash[64] = 0;
-	munmap(content, sbuf.st_size);
-	return flags ? fd : 1;
-}
-
 static sqlite3_stmt *run_for_hash(sqlite3 *db, char *sql, char *hash) {
 	int rc;
 	sqlite3_stmt *ifile;
@@ -602,57 +557,22 @@ static int set_elf_info(sqlite3 *db, char *hash, char *content, size_t length) {
 		hdr = libelf_header(content);
 		/* if lib, set soname */
 		if (libelf_type(content) == ET_DYN) {
-			char *elf;
-			Elf64_Shdr *shdr, *dynsect, *dynstrtab = 0;
-
-			elf = (char *)content;
-			for (i = 0; i < hdr->e_shnum; i++) {
-				shdr = (Elf64_Shdr *)(elf + hdr->e_shoff + i * hdr->e_shentsize);
-				if (shdr->sh_type == SHT_DYNAMIC) {
-					dynsect = shdr;
-				} else if (shdr->sh_type == SHT_STRTAB && i == hdr->e_shstrndx) {
-					dynstrtab = shdr;
-				}
-			}
-			if (!dynstrtab) {
-				exit(8);
-			}
-			if (!dynsect) {
-				exit(9);
-			}
-
-			char *name;
-			Elf64_Shdr *dyntab;
-			name = elf + dynstrtab->sh_offset;
-			for (i = 0; i < hdr->e_shnum; i++) {
-				shdr = (Elf64_Shdr *)(elf + hdr->e_shoff + i * hdr->e_shentsize);
-				if (shdr->sh_type == SHT_STRTAB && !strcmp(".dynstr", name+shdr->sh_name)) {
-					dyntab = shdr;
-				}
-			}
-			if (!dyntab) {
-				exit(10);
-			}
-
-			char *dynname;
-			Elf64_Dyn *dent;
-			dynname = elf + dyntab->sh_offset;
-
-			for (dent = (Elf64_Dyn *)(elf + dynsect->sh_offset); dent->d_tag != DT_NULL; dent++) {
-				if (dent->d_tag == DT_SONAME) {
-					char *soname = dynname + dent->d_un.d_val;
-					sqlite3_prepare_v2(db, "insert into elflibraries (file,soname) values (?,?)",-1, &ifile, 0);
-					sqlite3_bind_text(ifile,1,hash,64,SQLITE_STATIC);
-					sqlite3_bind_text(ifile,2,soname,-1,SQLITE_STATIC);
-					rc = sqlite3_step(ifile);
-					if (rc != SQLITE_DONE) {
-						SQLERROR(sqlite3_errmsg(db));
-						sqlite3_finalize(ifile);
-						fprintf(stderr, "error setting library soname\n");
-						return 0;
-					}
+			char *soname = libelf_soname(content);
+			if (soname) {
+
+				sqlite3_prepare_v2(db, "insert into elflibraries (file,soname) values (?,?)",-1, &ifile, 0);
+				sqlite3_bind_text(ifile,1,hash,64,SQLITE_STATIC);
+				sqlite3_bind_text(ifile,2,soname,-1,SQLITE_STATIC);
+				rc = sqlite3_step(ifile);
+				if (rc != SQLITE_DONE) {
+					SQLERROR(sqlite3_errmsg(db));
 					sqlite3_finalize(ifile);
+					fprintf(stderr, "error setting library soname\n");
+					return 0;
 				}
+				sqlite3_finalize(ifile);
+			} else {
+				fprintf(stderr, "can't find soname\n");
 			}
 		}
 
@@ -715,7 +635,7 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
 	void *content;
 	struct stat sbuf;
 	unsigned char tmp[32];
-	hash_state md;
+	struct sha256_state md;
 	sqlite3_stmt *ifile;
 	int haverow = 0,havedata = 0;
 	int j,rc,type;
@@ -734,7 +654,9 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
 		hash = hashbuf;
 	}
 
-	flags = 0; /* suppress warning, probably use to follow symlinks */
+	if (flags) {
+		fprintf(stderr, "zpm_import unused flags = %d\n", flags);
+	}
 	/* mmap the file */
 	fd = open(path, O_RDONLY);
 	if (fd == -1) {