From: Nathan Wagner <nw@hydaspes.if.org>
Date: Fri, 9 Nov 2018 22:03:09 +0000 (+0000)
Subject: add library dependencies of libraries
X-Git-Tag: v0.2.16~23
X-Git-Url: https://pd.if.org/git/?p=zpackage;a=commitdiff_plain;h=55218d5fc4522f66ffd3602fbc4410ebe5f0e670

add library dependencies of libraries
---

diff --git a/lib/zpm.c b/lib/zpm.c
index 8df7fa8..5511841 100644
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -451,107 +451,99 @@ static int run_for_hash(sqlite3 *db, char *sql, char *hash) {
 
 #define SQLERP(db, msg) fprintf(stderr, "%s: %s\n", msg, sqlite3_errmsg(db))
 
-static int set_elf_info(sqlite3 *db, char *hash, char *content, size_t length) {
-	if (length >= sizeof (Elf64_Ehdr) && libelf_iself(content)) {
-		char *strtab;
-		Elf64_Dyn *dyn;
-		int i;
-		Elf64_Phdr *phdr;
-		Elf64_Ehdr *hdr;
-		sqlite3_stmt *ifile;
-		int rc;
-
-		/* clear existing for this hash */
-
-		if (!run_for_hash(db, "delete from elflibraries where file = ?", hash)) {
-			SQLERP(db, "error clearing elf library");
-			return 0;
-		}
+static int set_elf_info(struct zpm *zpm, char *hash, char *content,
+	       	size_t length) {
+
+	char *strtab;
+	Elf64_Dyn *dyn;
+	int i;
+	Elf64_Phdr *phdr;
+	Elf64_Ehdr *hdr;
+	sqlite3_stmt *ifile;
+	sqlite3 *db = zpm->db;
 
-		if (!run_for_hash(db, "delete from elfneeded where file = ?", hash)) {
-			SQLERP(db, "error clearing elf needed");
-			return 0;
-		}
+	if (length < sizeof (Elf64_Ehdr) || !libelf_iself(content)) {
+		/* not an elf file */
+		return 1;
+	}
 
-		hdr = libelf_header(content);
-		/* if lib, set soname */
-		if (libelf_type(content) == ET_DYN) {
-			char *soname = libelf_soname(content);
-			if (soname) {
+	/* clear existing for this hash */
 
-				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");
+	if (!run_for_hash(db, "delete from elflibraries where file = ?", hash)) {
+		SQLERP(db, "error clearing elf library");
+		return 0;
+	}
+
+	if (!run_for_hash(db, "delete from elfneeded where file = ?", hash)) {
+		SQLERP(db, "error clearing elf needed");
+		return 0;
+	}
+
+	hdr = libelf_header(content);
+	/* if lib, set soname */
+	if (libelf_type(content) == ET_DYN) {
+		char *soname = libelf_soname(content);
+		if (soname) {
+			zpm_db_run(zpm, "insert into elflibraries (file,soname) values (%Q,%Q);", hash, soname);
+			if (zpm->error) {
+				return 0;
 			}
+		} else {
+			fprintf(stderr, "can't find soname\n");
 		}
+	}
 
-		/* if exe, set neededs */
-		if (libelf_type(content) == ET_EXEC) {
-			Elf64_Shdr *dsect = 0;
-			char *elf;
-
-			elf = (char *)content;
-			/* find program header table */
-			for (i = 0; i < hdr->e_phnum; i++) {
-				phdr = (Elf64_Phdr *)(elf + hdr->e_phoff + i * hdr->e_phentsize);
-				if (phdr->p_type == PT_DYNAMIC) {
-					dsect = (Elf64_Shdr *)(elf + phdr->p_offset);
-				}
-			}
-			if (!dsect) {
-				/* no dynamic section found */
-				return 1;
-			}
+	/* if exe, set neededs */
+	/* libraries can have neededs too */
+	if (libelf_type(content) == ET_EXEC || libelf_type(content) == ET_DYN) {
+		Elf64_Shdr *dsect = 0;
+		char *elf;
 
-#if 0
-			dyn = (Elf64_Dyn *)(elf + dsect->sh_offset);
-			if (!dyn) {
-				exit(9);
+		elf = (char *)content;
+		/* find program header table */
+		for (i = 0; i < hdr->e_phnum; i++) {
+			phdr = (Elf64_Phdr *)(elf + hdr->e_phoff + i * hdr->e_phentsize);
+			if (phdr->p_type == PT_DYNAMIC) {
+				dsect = (Elf64_Shdr *)(elf + phdr->p_offset);
 			}
-#endif
-			dyn = (Elf64_Dyn *)dsect;
+		}
+		if (!dsect) {
+			/* no dynamic section found */
+			return 1;
+		}
+
+		dyn = (Elf64_Dyn *)dsect;
 
-			dsect = libelf_section(elf, SHT_DYNAMIC);
-			Elf64_Shdr *strsect;
+		dsect = libelf_section(elf, SHT_DYNAMIC);
+		Elf64_Shdr *strsect;
 
-			strsect = libelf_section_n(elf, dsect->sh_link);
-			strtab = elf + strsect->sh_offset;
+		strsect = libelf_section_n(elf, dsect->sh_link);
+		strtab = elf + strsect->sh_offset;
 
-			sqlite3_prepare_v2(db, "insert into elfneeded (file,needed) values (?,?)",-1, &ifile, 0);
-			sqlite3_bind_text(ifile,1,hash,64,SQLITE_STATIC);
-			while (dyn->d_tag != DT_NULL) {
-				if (dyn->d_tag == DT_NEEDED) {
-					char *need;
-					int rc;
+		sqlite3_prepare_v2(db, "insert into elfneeded (file,needed) values (?,?)",-1, &ifile, 0);
+		sqlite3_bind_text(ifile,1,hash,64,SQLITE_STATIC);
+		while (dyn->d_tag != DT_NULL) {
+			if (dyn->d_tag == DT_NEEDED) {
+				char *need;
+				int rc;
 
-					need = strtab + dyn->d_un.d_val;
-					if (strlen(need) == 0) continue;
-					sqlite3_bind_text(ifile,2,need,strlen(need),SQLITE_STATIC);
+				need = strtab + dyn->d_un.d_val;
+				if (strlen(need) == 0) continue;
+				sqlite3_bind_text(ifile,2,need,strlen(need),SQLITE_STATIC);
 #if 0
-					fprintf(stderr, "%s needs %s\n", hash, need);
+				fprintf(stderr, "%s needs %s\n", hash, need);
 #endif
-					rc = sqlite3_step(ifile);
-					if (rc != SQLITE_DONE) {
-						SQLERP(db, "error setting needed library");
-						sqlite3_finalize(ifile);
-						return 0;
-					}
-					sqlite3_reset(ifile);
+				rc = sqlite3_step(ifile);
+				if (rc != SQLITE_DONE) {
+					SQLERP(db, "error setting needed library");
+					sqlite3_finalize(ifile);
+					return 0;
 				}
-				dyn++;
+				sqlite3_reset(ifile);
 			}
-			sqlite3_finalize(ifile);
+			dyn++;
 		}
+		sqlite3_finalize(ifile);
 	}
 	return 1;
 }
@@ -741,7 +733,7 @@ int zpm_import(struct zpm *zpm, char *path, uint32_t flags, char *hash) {
 		/* don't need the original file now */
 	}
 
-	if (!set_elf_info(zpm->db, hash, content, sbuf.st_size)) {
+	if (!set_elf_info(zpm, hash, content, sbuf.st_size)) {
 		fprintf(stderr, "setting elf info failed\n");
 		munmap(content, sbuf.st_size);
 		return 0;