pkg->db = 0;
pkg->path = 0;
- pkg->version = 0;
- pkg->release = 0;
- pkg->pkgname = 0;
- pkg->installed = 0;
+ pkg->current_package = 0;
- rc = sqlite3_open(path, &db);
+ rc = sqlite3_open_v2(path, &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
if (rc) {
SQLERROR(sqlite3_errmsg(db));
sqlite3_close(db);
}
/* set package struct variables, database, environment, then command line */
-int zpm_readopts(struct zpm *pkg, int ac, char **av) {
+int zpm_readopts(struct zpm *zpm, int ac, char **av) {
char *ev;
+ struct zpm_package *pkg;
- if (!pkg) {
+ if (!zpm) {
return -1;
}
- ev = getenv("ZPMPACKAGE");
- if (ev) {
- pkg->pkgname = dupstr(ev);
- }
- ev = getenv("ZPMPKGREL");
- if (ev) {
- pkg->release = strtol(ev, 0, 0);
- }
- ev = getenv("ZPMPKGVER");
- if (ev) {
- pkg->version = dupstr(ev);
+ pkg = zpm->current_package;
+
+ if (pkg) {
+ ev = getenv("ZPMPACKAGE");
+ if (ev) {
+ pkg->name = dupstr(ev);
+ }
+ ev = getenv("ZPMPKGREL");
+ if (ev) {
+ pkg->release = strtol(ev, 0, 0);
+ }
+ ev = getenv("ZPMPKGVER");
+ if (ev) {
+ pkg->version = dupstr(ev);
+ }
}
/* now, parse the options, return optind so the caller can adjust if needed */
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;
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");
}
}
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);
+#endif
rc = sqlite3_step(ifile);
if (rc != SQLITE_DONE) {
SQLERROR(sqlite3_errmsg(db));
}
#if 1
-int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
+int zpm_import(struct zpm *zpm, char *path, uint32_t flags, char *hash) {
int fd;
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;
size_t outlen = 0;
void *outbuf;
- if (!pkg || !pkg->db || !path) {
+ if (!zpm || !zpm->db || !path) {
return 0;
}
/* mmap the file */
fd = open(path, O_RDONLY);
if (fd == -1) {
- pkg->error = errno;
+ zpm->error = errno;
fprintf(stderr, "%s can't open %s: %s\n", __FUNCTION__, path,strerror(errno));
return 0;
}
if (fstat(fd, &sbuf) == -1) {
- pkg->error = errno;
+ zpm->error = errno;
fprintf(stderr, "%s can't fstat %s: %s\n", __FUNCTION__, path,strerror(errno));
return 0;
}
}
/* TODO this is ok, just stored differently */
fprintf(stderr, "%s can't import %s file: %s\n", __FUNCTION__, ftype, path);
- pkg->error = EINVAL;
+ zpm->error = EINVAL;
return 0;
}
content = mmap(0, sbuf.st_size, PROT_READ,MAP_PRIVATE, fd, 0);
close(fd);
if (!content) {
- pkg->error = errno;
+ zpm->error = errno;
fprintf(stderr, "%s can't mmap %s: %s\n", __FUNCTION__, path,strerror(errno));
return 0;
}
//fprintf(stderr, "file %s: %s\n", path, hash);
/* TODO check null */
- sqlite3 *db = pkg->db;
+ sqlite3 *db = zpm->db;
/* prepare and bind */
if (rc != SQLITE_ROW) {
/* didn't find a row */
SQLERROR(sqlite3_errmsg(db));
- zpm_rollback(pkg);
+ zpm_rollback(zpm);
munmap(content, sbuf.st_size);
return 0;
}
/* start a transaction */
// do that outside of here
- //zpm_begin(pkg);
+ //zpm_begin(zpm);
/* insert */
if (haverow) {
if (rc != SQLITE_OK) {
SQLERROR(sqlite3_errmsg(db));
fprintf(stderr, "cant prepare data\n");
- zpm_rollback(pkg);
+ zpm_rollback(zpm);
munmap(content, sbuf.st_size);
return 0;
}
if (rc != SQLITE_OK) {
SQLERROR(sqlite3_errmsg(db));
fprintf(stderr, "cant bind size\n");
- zpm_rollback(pkg);
+ zpm_rollback(zpm);
munmap(content, sbuf.st_size);
return 0;
}
if (rc != SQLITE_OK) {
SQLERROR(sqlite3_errmsg(db));
fprintf(stderr, "cant bind content\n");
- zpm_rollback(pkg);
+ zpm_rollback(zpm);
munmap(content, sbuf.st_size);
return 0;
}
if (rc != SQLITE_OK) {
SQLERROR(sqlite3_errmsg(db));
fprintf(stderr, "cant bind hash\n");
- zpm_rollback(pkg);
+ zpm_rollback(zpm);
munmap(content, sbuf.st_size);
return 0;
}
if (rc != SQLITE_DONE) {
SQLERROR(sqlite3_errmsg(db));
sqlite3_finalize(ifile);
- zpm_rollback(pkg);
+ zpm_rollback(zpm);
munmap(content, sbuf.st_size);
return 0;
}
sqlite3_finalize(ifile);
/* commit */
- //zpm_commit(pkg);
+ //zpm_commit(zpm);
/* don't need the original file now */
}
- if (!set_elf_info(pkg->db, hash, content, sbuf.st_size)) {
+ if (!set_elf_info(zpm->db, hash, content, sbuf.st_size)) {
fprintf(stderr, "setting elf info failed\n");
munmap(content, sbuf.st_size);
return 0;
munmap(content, sbuf.st_size);
/* if package and not nopackage flag, add to package */
- if (pkg->pkgname && (!ZPM_NOPACKAGE)) {
+ if (zpm->current_package->name && (!ZPM_NOPACKAGE)) {
/* TODO */
}
projects / zpackage / blobdiff