zpm_clearmem(zpm);
+ if (!path) {
+ path = getenv("ZPMDB");
+ }
+
+ if (!path) {
+ path = "/var/lib/zpm/local.db";
+ }
+
rc = sqlite3_open_v2(path, &db, SQLITE_OPEN_READWRITE, NULL);
if (rc) {
SQLERROR(sqlite3_errmsg(db));
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) {
}
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));
tmpfile, strerror(errno));
sqlite3_finalize(ifile);
sqlite3_close(db);
+ free(tmpfile);
return 0;
}
} else {
}
}
+ free(tmpfile);
return rc;
}
#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;
+static int set_elf_info(struct zpm *zpm, char *hash, char *content,
+ size_t length) {
- /* clear existing for this hash */
+ 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 elflibraries where file = ?", hash)) {
- SQLERP(db, "error clearing elf library");
- return 0;
- }
+ if (length < sizeof (Elf64_Ehdr) || !libelf_iself(content)) {
+ /* not an elf file */
+ return 1;
+ }
- if (!run_for_hash(db, "delete from elfneeded where file = ?", hash)) {
- SQLERP(db, "error clearing elf needed");
- return 0;
- }
+ /* clear existing for this hash */
- hdr = libelf_header(content);
- /* if lib, set soname */
- if (libelf_type(content) == ET_DYN) {
- char *soname = libelf_soname(content);
- if (soname) {
+ if (!run_for_hash(db, "delete from elflibraries where file = ?", hash)) {
+ SQLERP(db, "error clearing elf library");
+ return 0;
+ }
- 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 elfneeded where file = ?", hash)) {
+ SQLERP(db, "error clearing elf needed");
+ return 0;
+ }
- /* 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);
- }
+ 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;
}
- if (!dsect) {
- /* no dynamic section found */
- return 1;
+ }
+ /* some dyn don't have an soname, so we don't
+ * need to warn */
+ }
+
+ /* 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;
+
+ 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 0
- dyn = (Elf64_Dyn *)(elf + dsect->sh_offset);
- if (!dyn) {
- exit(9);
- }
-#endif
- dyn = (Elf64_Dyn *)dsect;
+ 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;
}
int fd;
void *content = 0;
struct stat sbuf;
- unsigned char tmp[32];
- struct sha256_state md;
sqlite3_stmt *ifile = 0;
int haverow = 0,havedata = 0;
- int j,rc,type;
+ int rc,type;
char hashbuf[65];
/* xz compress it */
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]);
- }
+ zpm_hash_mem(content, sbuf.st_size, hash);
hash[64] = 0;
/* TODO check null */
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) {
/* 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;
projects / zpackage / blobdiff