#include "newdb.c"
int zpm_db_initialize(struct zpm *pkg) {
- //fprintf(stderr, "initializing zpm database\n");
char *error;
switch (sqlite3_exec(pkg->db, createdb, (int (*)(void *,int,char **,char **))0, NULL, &error)) {
case SQLITE_OK: break;
SQLERROR(sqlite3_errmsg(pkg->db));
fprintf(stderr, "error: %s\n", error);
sqlite3_free(error);
+ zpm_rollback(pkg);
return 0;
break;
}
return zpm;
}
+static void zpm_set_db_errmsg(struct zpm *zpm, const char *msg) {
+ if (zpm) {
+ if (zpm->dberrmsg) {
+ free(zpm->dberrmsg);
+ }
+ if (msg) {
+ zpm->dberrmsg = strdup(msg);
+ if (!zpm->dberrmsg) {
+ zpm->error = 1;
+ }
+ } else {
+ zpm->dberrmsg = 0;
+ }
+ }
+}
+
int zpm_init(struct zpm *pkg, char *path) {
int rc;
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);
if (rc) {
- SQLERROR(sqlite3_errmsg(db));
- sqlite3_close(db);
+ pkg->error = 1;
+ pkg->dbresult = rc;
+ zpm_set_db_errmsg(pkg, sqlite3_errstr(rc));
+ if (db) {
+ sqlite3_close(db);
+ }
+ fprintf(stderr, "error (%d): %s: %s\n", rc,
+ pkg->dberrmsg ? pkg->dberrmsg : "null", path);
+
return 0;
}
pkg->db = db;
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);
+
+ sqlite3_finalize(ifile);
- return 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);
- 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);
return 1;
}
-#if 1
int zpm_import(struct zpm *zpm, char *path, uint32_t flags, char *hash) {
int fd;
- void *content;
+ void *content = 0;
struct stat sbuf;
unsigned char tmp[32];
struct sha256_state md;
- sqlite3_stmt *ifile;
+ sqlite3_stmt *ifile = 0;
int haverow = 0,havedata = 0;
int j,rc,type;
char hashbuf[65];
sprintf(hash+j*2, "%02x", (unsigned)tmp[j]);
}
hash[64] = 0;
- //fprintf(stderr, "file %s: %s\n", path, hash);
/* TODO check null */
sqlite3 *db = zpm->db;
if (rc != SQLITE_ROW) {
/* didn't find a row */
SQLERROR(sqlite3_errmsg(db));
- zpm_rollback(zpm);
munmap(content, sbuf.st_size);
return 0;
}
haverow = 1;
-// fprintf(stderr, "have row for hash\n");
type = sqlite3_column_type(ifile, 0);
if (type == SQLITE_NULL) {
/* TODO assert, this shouldn't be possible? */
outbuf = compresslzma(content, sbuf.st_size, &outlen);
if (!outbuf) {
fprintf(stderr, "compresslzma failed\n");
- munmap(content, sbuf.st_size);
+ munmap(content, sbuf.st_size);
return 0;
}
- //fprintf(stderr, "compressed to %zu\n", outlen);
-
- /* start a transaction */
- // do that outside of here
- //zpm_begin(zpm);
/* insert */
if (haverow) {
- //fprintf(stderr, "adding file data\n");
- rc = sqlite3_prepare(db, "update files set size = ?, content = ? where hash = ?", -1, &ifile,0);
+ rc = sqlite3_prepare_v2(db, "update files set size = ?, content = ? where hash = ?", -1, &ifile,0);
} else {
- //fprintf(stderr, "creating new data row\n");
- rc = sqlite3_prepare(db, "insert into files (size, content, hash) values (?,?,?)", -1, &ifile,0);
+ rc = sqlite3_prepare_v2(db, "insert into files (size, content, hash) values (?,?,?)", -1, &ifile,0);
}
+
if (rc != SQLITE_OK) {
SQLERROR(sqlite3_errmsg(db));
fprintf(stderr, "cant prepare data\n");
- zpm_rollback(zpm);
- munmap(content, sbuf.st_size);
+ munmap(content, sbuf.st_size);
return 0;
}
- sqlite3_bind_int64(ifile, 1, (sqlite3_int64)sbuf.st_size);
+ rc = sqlite3_bind_int64(ifile, 1, (sqlite3_int64)sbuf.st_size);
if (rc != SQLITE_OK) {
SQLERROR(sqlite3_errmsg(db));
+ sqlite3_finalize(ifile);
fprintf(stderr, "cant bind size\n");
- zpm_rollback(zpm);
- munmap(content, sbuf.st_size);
+ munmap(content, sbuf.st_size);
return 0;
}
- sqlite3_bind_blob64(ifile, 2, outbuf, (sqlite3_int64)outlen, SQLITE_STATIC);
+
+ rc = sqlite3_bind_blob64(ifile, 2, outbuf,
+ (sqlite3_int64)outlen, SQLITE_STATIC);
if (rc != SQLITE_OK) {
SQLERROR(sqlite3_errmsg(db));
+ sqlite3_finalize(ifile);
fprintf(stderr, "cant bind content\n");
- zpm_rollback(zpm);
- munmap(content, sbuf.st_size);
+ munmap(content, sbuf.st_size);
return 0;
}
- sqlite3_bind_text(ifile, 3, hash, 64, SQLITE_STATIC);
+
+ rc = sqlite3_bind_text(ifile, 3, hash, 64, SQLITE_STATIC);
if (rc != SQLITE_OK) {
SQLERROR(sqlite3_errmsg(db));
fprintf(stderr, "cant bind hash\n");
- zpm_rollback(zpm);
- munmap(content, sbuf.st_size);
+ sqlite3_finalize(ifile);
+ munmap(content, sbuf.st_size);
return 0;
}
+
rc = sqlite3_step(ifile);
if (rc != SQLITE_DONE) {
SQLERROR(sqlite3_errmsg(db));
sqlite3_finalize(ifile);
- zpm_rollback(zpm);
- munmap(content, sbuf.st_size);
+ munmap(content, sbuf.st_size);
return 0;
}
sqlite3_finalize(ifile);
- /* commit */
- //zpm_commit(zpm);
-
/* don't need the original file now */
-
}
if (!set_elf_info(zpm->db, hash, content, sbuf.st_size)) {
munmap(content, sbuf.st_size);
- /* if package and not nopackage flag, add to package */
- if (zpm->current_package->name && (!ZPM_NOPACKAGE)) {
- /* TODO */
- }
-
/* return */
return 1;
}
-#endif
-
-#if 0
-int main(int ac, char **av){
- sqlite3 *db = 0;
- int rc;
-
- int blobsize;
- int64_t size;
- void *xzdata;
- int type;
- FILE *out;
- sqlite3_stmt *ifile;
-
- char *hash;
- char *filename;
-
- if (ac < 3) {
- fprintf(stderr, "usage: db hash file\n");
- return 1;
- }
-
- rc = sqlite3_open(av[1], &db);
- if (rc) {
- SQLERROR(sqlite3_errmsg(db));
- sqlite3_close(db);
- return 1;
- }
-
-}
-#endif
-
-#if 0
-Packages are sqlite databases
-
-get application id and userver
-
-Primitive operations:
-
-add path to repo
-associate path with package
-associate blob with path?
-add blob to repo
-* extract blob to a path
-compare blob to filesystem path
-create package with info
-
-Extra primitives:
-
-record elf information about blob
-compress blob
-uncompress blob
-sign a package? What are we verifying?
-#endif
projects / zpackage / blobdiff