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);
}
/* 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 */
int fd;
void *content;
struct stat sbuf;
- hash_state md;
+ struct sha256_state md;
int j;
unsigned char tmp[32];
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");
}
}
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;
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) {