#include "sha256.h"
-#if 0
-struct zpm {
- sqlite3 *db;
- char *path; /* path to package file */
- char *version;
- int release;
- char *pkgname;
- time_t installed; /* install time, 0 for not installed */
-};
-
-struct zpm_file {
- char *path;
- int mode;
- uint32_t filetype;
- char *tags;
- char *owner;
- char *group;
- char *hash; /* could be fixed length */
- time_t mtime;
- struct zpm_file *next; /* so you can make a linked list */
-};
-
-/* NULL? Create? */
-/* associate with a package ? if only one? first? */
-int zpm_open(struct zpm *pkg, char *path);
-int zpm_pkgname(char *base, char *version, int release); /* construct a package file name */
-
-/* flags for preserving mode, owner, etc */
-/* puts hash of import in hash */
-/* path can be a hash, with an "INTERNAL" flag, i.e. internally import */
-#define ZPM_MODE 0x1
-#define ZPM_OWNER 0x2
-#define ZPM_MTIME 0x4
-#define ZPM_INTERNAL 0x8
-#define ZPM_NOBLOB 0x10
-/* don't run scripts on install */
-#define ZPM_NOSCRIPTS 0x10
-/* don't associate the file with a package, just do a raw insert */
-/* otherwise, associate it with the current package */
-#define ZPM_NOPACKAGE 0x20
-
-int zpm_import(struct zpm *zp, char *path, uint32_t flags, uint8_t *hash);
-
-/* link and unlink hashes to packages */
-int zpm_link(struct zpm *pkg, char *path, char *hash, struct zpm_file *fileinfo);
-int zpm_unlink(struct zpm *pkg, char *path);
-
-/* tag a file. relative to "current package" */
-int zpm_tag(struct zpm *zp, char *path, char *tags);
-/* should this be broken up into separage functions ? */
-int zpm_md(struct zpm *zp, char *path, int mode, char *owner, char *group, time_t mtime);
-
-/* export hash to dest */
-int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode);
-
-/* export path to dest */
-int zpm_export(struct zpm *zp, char *path, uint32_t flags, char *dest);
-
-int zpm_close(struct zpm *zp);
-
-/* attach a signature to a package */
-int zpm_sign(struct zpm *z, size_t s, void *signature);
-
-/* set the package info to the nth package, -1 to return count? */
-/* further import/exports and such will be relative to this package */
-int zpm_package(struct zpm *zp, int n);
-
-/* get file information */
-int zpm_stat(struct zpm *z, struct zpm_file *f, int n);
-
-/* will also set the package context to the new package */
-int zpm_newpkg(struct zpm *z, char *base, char *version, int release);
-
-/* transactions */
-int zpm_begin(struct zpm *z);
-int zpm_commit(struct zpm *z);
-int zpm_rollback(struct zpm *z);
-
-/* higher level operations */
-
-/* install or uninstall the package */
-/* flag for keeping the blobs in local */
-/* what about tag filtering */
-int zpm_install(struct zpm *z, struct zpm *local, uint32_t flags);
-int zpm_uninstall(struct zpm *local);
-
-/* slurp up the actual blobs */
-/* what about versioning them if they change */
-int zpm_preserve(struct zpm *local);
-
-/* check file integrity */
-int zpm_checkinstall(struct zpm *local);
-
-int zpm_merge(struct zpm *z, struct zpm *src, uint32_t flags);
-
-void uncompresslzma(void *buf, size_t bufsize, FILE *out);
-#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 (?,?,?)";
- int rc;
- sqlite3_stmt *ifile;
-
- rc = sqlite3_prepare(db, sql, -1, &ifile,0);
- if (rc != SQLITE_OK) {
- SQLERROR(sqlite3_errmsg(db));
- return 0;
- }
- rc = sqlite3_bind_text(ifile, 1, base, strlen(base), SQLITE_STATIC);
- if (rc != SQLITE_OK) {
- SQLERROR(sqlite3_errmsg(db));
- fprintf(stderr, "cant bind package name\n");
- zpm_rollback(pkg);
- return 0;
- }
- sqlite3_bind_text(ifile, 2, version, strlen(version), SQLITE_STATIC);
- sqlite3_bind_int(ifile, 3, release)
-
- rc = sqlite3_step(ifile);
-
- if (rc != SQLITE_DONE) {
- SQLERROR(sqlite3_errmsg(db));
- sqlite3_finalize(ifile);
- return 0;
- }
- sqlite3_finalize(ifile);
- z->pkg = dupstr(base);
- z->version = dupstr(version);
- z->release = release;
-}
-#endif
-
int zpm_begin(struct zpm *z) {
char *errstr = 0;
sqlite3_exec(z->db, "begin;", NULL, NULL, &errstr);
#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 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->current_package = 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;
+ }
+ } 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->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;
+
+ zpm_clearmem(zpm);
- /* TODO if this is a new database, create structures */
+ 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));
+ 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;
}
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) {
);
}
-/* set package struct variables, database, environment, then command line */
-int zpm_readopts(struct zpm *zpm, int ac, char **av) {
- char *ev;
- struct zpm_package *pkg;
-
- if (!zpm) {
- return -1;
- }
-
- 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 av ? ac : 1;
-}
-
-int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
+int zpm_extract(struct zpm *pkg, char *hash, char *path, mode_t mode) {
int rc;
-
int blobsize;
- //int64_t size;
void *xzdata;
int type;
- FILE *out;
+ int out;
sqlite3_stmt *ifile;
+ size_t len;
+ char *tmpfile = 0;
+ sqlite3 *db;
- /* TODO check null */
- sqlite3 *db = pkg->db;
+ if (!pkg || !pkg->db) {
+ return 0;
+ }
+ db = pkg->db;
+
+ if (!path) {
+ path = "-";
+ }
rc = sqlite3_prepare(db, "select size, content from files where hash = ?", -1, &ifile,0);
if (rc != SQLITE_OK) {
blobsize = sqlite3_column_bytes(ifile, 1);
if (strcmp(path, "-")) {
- out = fopen(path, "w");
+ len = strlen(path);
+ tmpfile = malloc(len+8+1);
+ if (!tmpfile) {
+ fprintf(stderr, "malloc error\n");
+ return 0;
+ }
+ sprintf(tmpfile, "%sXXXXXX", path);
+
+ out = open(tmpfile, O_CREAT|O_WRONLY|O_TRUNC, 0600);
+ if (out == -1) {
+ fprintf(stderr, "can't open output file %s: %s\n",
+ tmpfile, strerror(errno));
+ sqlite3_finalize(ifile);
+ sqlite3_close(db);
+ free(tmpfile);
+ return 0;
+ }
} else {
- out = stdout;
- }
- if (!out) {
- fprintf(stderr, "can't open output file %s\n", path);
- sqlite3_finalize(ifile);
- sqlite3_close(db);
- return 0;
+ out = 1;
}
- //fwrite(xzdata, blobsize, 1, stdout);
- //fprintf(stderr, "uncompressing %d bytes at %p, expect %lld\n", blobsize, xzdata, (long long int)size);
+#if 0
+ fprintf(stderr, "uncompressing %d bytes at %p, expect %lld\n", blobsize, xzdata, (long long int)size);
+#endif
uncompresslzma(xzdata, blobsize, out);
- fclose(out);
- chmod(path, mode);
-
+ close(out);
sqlite3_finalize(ifile);
- return 1;
+ rc = 1;
+ if (tmpfile) {
+ if (chmod(tmpfile, mode) == -1) {
+ fprintf(stderr, "can't chmod %s: %s\n", tmpfile,
+ strerror(errno));
+ rc = 0;
+ } else if (rename(tmpfile, path) == -1) {
+ fprintf(stderr, "extract rename failed: %s\n",
+ strerror(errno));
+ rc = 0;
+ }
+ }
+
+ if (rc == 0 && tmpfile) {
+ if (unlink(tmpfile) == -1) {
+ fprintf(stderr, "unlink tmpfile %s fail: %s\n",
+ tmpfile,
+ strerror(errno));
+ }
+ }
+
+ free(tmpfile);
+ return rc;
}
-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);
- return ifile;
+ sqlite3_finalize(ifile);
+
+ return rc == SQLITE_DONE;
}
-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;
-
- /* 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);
- 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");
- return 0;
- }
- sqlite3_finalize(ifile);
+#define SQLERP(db, msg) fprintf(stderr, "%s: %s\n", msg, sqlite3_errmsg(db))
- hdr = libelf_header(content);
- /* if lib, set soname */
- if (libelf_type(content) == ET_DYN) {
- char *soname = libelf_soname(content);
- if (soname) {
+static int set_elf_info(struct zpm *zpm, char *hash, char *content,
+ size_t length) {
- 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");
- }
- }
+ char *strtab;
+ Elf64_Dyn *dyn;
+ int i;
+ Elf64_Phdr *phdr;
+ Elf64_Ehdr *hdr;
+ sqlite3_stmt *ifile;
+ sqlite3 *db = zpm->db;
- /* if exe, set neededs */
- if (libelf_type(content) == ET_EXEC) {
- Elf64_Shdr *dsect;
- 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 (length < sizeof (Elf64_Ehdr) || !libelf_iself(content)) {
+ /* not an elf file */
+ return 1;
+ }
+
+ /* clear existing for this hash */
+
+ if (!run_for_hash(db, "delete from elflibraries where file = ?", hash)) {
+ SQLERP(db, "error clearing elf library");
+ return 0;
+ }
+
+ if (!run_for_hash(db, "delete from elfneeded where file = ?", hash)) {
+ SQLERP(db, "error clearing elf needed");
+ return 0;
+ }
+
+ 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;
}
- dyn = (Elf64_Dyn *)(elf + dsect->sh_offset);
- if (!dyn) {
- exit(9);
+ }
+ /* 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);
}
- dyn = (Elf64_Dyn *)dsect;
+ }
+ if (!dsect) {
+ /* no dynamic section found */
+ return 1;
+ }
- dsect = libelf_section(elf, SHT_DYNAMIC);
- Elf64_Shdr *strsect;
+ dyn = (Elf64_Dyn *)dsect;
- strsect = libelf_section_n(elf, dsect->sh_link);
- strtab = elf + strsect->sh_offset;
+ dsect = libelf_section(elf, SHT_DYNAMIC);
+ Elf64_Shdr *strsect;
- 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;
+ strsect = libelf_section_n(elf, dsect->sh_link);
+ strtab = elf + strsect->sh_offset;
- need = strtab + dyn->d_un.d_val;
- if (strlen(need) == 0) continue;
- sqlite3_bind_text(ifile,2,need,strlen(need),SQLITE_STATIC);
+ 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);
#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) {
- SQLERROR(sqlite3_errmsg(db));
- sqlite3_finalize(ifile);
- fprintf(stderr, "error setting needed library\n");
- 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;
}
-#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;
+ 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;
- //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? */
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);
+ 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);
+//// fprintf(stderr, "compress finished\n");
/* 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)) {
+ if (!set_elf_info(zpm, 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 (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