#define SQLERROR(x) fprintf(stderr, "%s %d: %s\n", __func__, __LINE__, (x))
#endif
-static char *dupstr(char *s) {
- size_t n;
- char *d;
-
- n = strlen(s);
- d = malloc(n+1);
- if (d) {
- d = strcpy(d, s);
- }
- return d;
-}
-
#if 0
int zpm_newpkg(struct zpm *z, char *base, char *version, int release) {
char *sql = "insert or ignore into packages (package,version,release) values (?,?,?)";
return 1;
}
-/* NULL? Create? */
-int zpm_open(struct zpm *pkg, char *path) {
- int rc;
+
+/* assumes pkg->db is set */
+static int setupdb(struct zpm *zpm) {
char *errstr = 0;
- sqlite3 *db = 0;
int appid, dbver;
- pkg->db = 0;
- pkg->path = 0;
- pkg->version = 0;
- pkg->release = 0;
- pkg->pkgname = 0;
- pkg->installed = 0;
+ zpm->error = 0;
+
+ appid = zpm_db_pragma(zpm, 1);
+ dbver = zpm_db_pragma(zpm, 2);
+
+ if (appid != 0x5a504442) {
+ fprintf(stderr, "unknown database type\n");
+ zpm->error = 1;
+ return 0;
+ }
+
+ if (dbver > 1) {
+ fprintf(stderr, "version %d zpm db detected, this program only works with version 1 databases\n", dbver);
+ zpm->error = 1;
+ return 0;
+ }
+
+ sqlite3_exec(zpm->db, "pragma foreign_keys = ON;", NULL, NULL, &errstr);
+
+ if (errstr) {
+ free(zpm->errmsg);
+ zpm->errmsg = strdup(errstr);
+ fprintf(stderr, "sqlite foreign key error: %s\n", errstr);
+ sqlite3_free(errstr);
+ zpm->error = 1;
+ return 0;
+ }
+
+ /* TODO add vercmp */
+
+ return 1;
+}
+
+struct zpm *zpm_clearmem(struct zpm *zpm) {
+ if (!zpm) {
+ zpm = malloc(sizeof *zpm);
+ }
+
+ if (zpm) {
+ *zpm = (struct zpm){0};
+ }
+
+ 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;
+ }
+ }
+ }
+}
+
+int zpm_init(struct zpm *pkg, char *path) {
+ int rc;
+ sqlite3 *db = 0;
+ int appid;
- rc = sqlite3_open(path, &db);
+ 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, path);
+
return 0;
}
pkg->db = db;
- pkg->path = dupstr(path);
+ pkg->path = strdup(path);
appid = zpm_db_pragma(pkg, 1);
- dbver = zpm_db_pragma(pkg, 2);
- //fprintf(stderr, "db appid = %x, dbver = %d\n", appid, dbver);
switch (appid) {
case 0: if (!zpm_db_initialize(pkg)) {
sqlite3_close(db);
return 1;
};
break;
- case 0x5a504442: break;
+ case 0x5a504442:
+ /* already initialized */
+ break;
default:
fprintf(stderr, "unknown database type\n");
sqlite3_close(db);
return 0;
break;
}
- if (dbver > 1) {
- fprintf(stderr, "version %d zpm db detected, this program only works with version 1 databases\n", dbver);
- sqlite3_close(db);
- return 0;
- }
- sqlite3_exec(pkg->db, "pragma foreign_keys = ON;", NULL, NULL, &errstr);
- if (errstr) {
- fprintf(stderr, "sqlite foreign key error: %s\n", errstr);
- sqlite3_free(errstr);
+ if (!setupdb(pkg)) {
sqlite3_close(db);
+ pkg->db = 0;
return 0;
}
+ zpm_addvercmp(pkg);
+
+ return 1;
+}
+int zpm_open(struct zpm *zpm, char *path) {
+ int rc;
+ sqlite3 *db = 0;
- /* TODO if this is a new database, create structures */
+ zpm_clearmem(zpm);
+
+ rc = sqlite3_open_v2(path, &db, SQLITE_OPEN_READWRITE, NULL);
+ if (rc) {
+ SQLERROR(sqlite3_errmsg(db));
+ sqlite3_close(db);
+ zpm->error = 1;
+ fprintf(stderr, "path = %s\n", path);
+ return 0;
+ }
+ zpm->db = db;
+ zpm->path = strdup(path);
+
+ if (!setupdb(zpm)) {
+ sqlite3_close(db);
+ zpm->db = 0;
+ zpm->error = 1;
+ return 0;
+ }
+ zpm_addvercmp(zpm);
- /* get a package. what if more than one? what if none? */
return 1;
}
);
}
-/* set package struct variables, database, environment, then command line */
-int zpm_readopts(struct zpm *pkg, int ac, char **av) {
- char *ev;
-
- if (!pkg) {
- 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);
- }
-
- /* now, parse the options, return optind so the caller can adjust if needed */
-
- return av ? ac : 1;
-}
-
int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
int rc;
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;
- struct sha256_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) {
+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);
+ 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);
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));
+ 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 *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;
+ 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];
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;
}
sprintf(hash+j*2, "%02x", (unsigned)tmp[j]);
}
hash[64] = 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);
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(pkg);
/* 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(pkg);
- 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(pkg);
- 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(pkg);
- 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(pkg);
- 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(pkg);
- munmap(content, sbuf.st_size);
+ munmap(content, sbuf.st_size);
return 0;
}
sqlite3_finalize(ifile);
- /* commit */
- //zpm_commit(pkg);
-
/* 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)) {
- /* 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