sqlite3 *db = 0;
int appid;
+ if (!pkg) {
+ return 0;
+ }
+
zpm_clearmem(pkg);
rc = sqlite3_open_v2(path, &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
pkg->db = 0;
return 0;
}
+ zpm_addvercmp(pkg);
return 1;
}
zpm->error = 1;
return 0;
}
+ zpm_addvercmp(zpm);
return 1;
}
return 1;
}
-static sqlite3_stmt *run_for_hash(sqlite3 *db, char *sql, char *hash) {
+static int run_for_hash(sqlite3 *db, char *sql, char *hash) {
int rc;
sqlite3_stmt *ifile;
/* hash, filename */
sqlite3_bind_text(ifile, 1, hash, 64, SQLITE_STATIC);
+ do {
+ rc = sqlite3_step(ifile);
+ } while (rc == SQLITE_ROW);
- return ifile;
+ sqlite3_finalize(ifile);
+
+ return rc == SQLITE_DONE;
}
+#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;
sqlite3_stmt *ifile;
int rc;
- /* go ahead and set up elf information now */
/* clear existing for this hash */
- ifile = run_for_hash(db, "delete from elfinfo where file = ?", hash);
- do {
- rc = sqlite3_step(ifile);
-#if 0
- if (rc == SQLITE_ROW) {
- int nc;
- fprintf(stderr, "delete row has %d columns: ", sqlite3_column_count(ifile));
- nc = sqlite3_column_count(ifile);
- for (i = 0; i < nc; i++) {
- char *r;
- r = sqlite3_column_text(ifile, i);
- fprintf(stderr, ", %s", r);
- }
- fprintf(stderr, "\n");
- }
-#endif
- } while (rc == SQLITE_ROW);
- if (rc != SQLITE_DONE) {
- SQLERROR(sqlite3_errmsg(db));
- sqlite3_finalize(ifile);
- fprintf(stderr, "error clearing elf info: %d\n", rc);
+ if (!run_for_hash(db, "delete from elfinfo where file = ?", hash)) {
+ SQLERP(db, "error clearing elf info");
return 0;
}
- sqlite3_finalize(ifile);
- ifile = run_for_hash(db, "delete from elflibraries where file = ?", hash);
- do {
- rc = sqlite3_step(ifile);
- } while (rc == SQLITE_ROW);
- if (rc != SQLITE_DONE) {
- SQLERROR(sqlite3_errmsg(db));
- sqlite3_finalize(ifile);
- fprintf(stderr, "error clearing elf library: %d\n", rc);
+
+ if (!run_for_hash(db, "delete from elflibraries where file = ?", hash)) {
+ SQLERP(db, "error clearing elf library");
return 0;
}
- sqlite3_finalize(ifile);
- ifile = run_for_hash(db, "delete from elfneeded where file = ?", hash);
- do {
- rc = sqlite3_step(ifile);
- } while (rc == SQLITE_ROW);
- if (rc != SQLITE_DONE) {
- SQLERROR(sqlite3_errmsg(db));
- sqlite3_finalize(ifile);
- fprintf(stderr, "error clearing elf needed\n");
+
+ if (!run_for_hash(db, "delete from elfneeded where file = ?", hash)) {
+ SQLERP(db, "error clearing elf needed");
return 0;
}
- sqlite3_finalize(ifile);
hdr = libelf_header(content);
/* if lib, set soname */
/* if exe, set neededs */
if (libelf_type(content) == ET_EXEC) {
- Elf64_Shdr *dsect;
+ Elf64_Shdr *dsect = 0;
char *elf;
elf = (char *)content;
dsect = (Elf64_Shdr *)(elf + phdr->p_offset);
}
}
+ if (!dsect) {
+ /* no dynamic section found */
+ return 1;
+ }
+
+#if 0
dyn = (Elf64_Dyn *)(elf + dsect->sh_offset);
if (!dyn) {
exit(9);
}
+#endif
dyn = (Elf64_Dyn *)dsect;
dsect = libelf_section(elf, SHT_DYNAMIC);
#endif
rc = sqlite3_step(ifile);
if (rc != SQLITE_DONE) {
- SQLERROR(sqlite3_errmsg(db));
+ SQLERP(db, "error setting needed library");
sqlite3_finalize(ifile);
- fprintf(stderr, "error setting needed library\n");
return 0;
}
sqlite3_reset(ifile);