]> pd.if.org Git - zpackage/blobdiff - lib/zpm.c
add library findpkg and quote
[zpackage] / lib / zpm.c
index 9d62ad7d7debb32172cb4ee50299c01f7161a467..3abbc37d5d07f87ebbe5836dcfd1c2c700d6e634 100644 (file)
--- a/lib/zpm.c
+++ b/lib/zpm.c
@@ -183,6 +183,11 @@ int zpm_commit(struct zpm *z) {
        return 1;
 }
 
+/* wrapper for sqlite3_exec */
+int zpm_exec(struct zpm *z, const char *sql, int(*callback)(void *, int, char **, char**), void *arg, char **errmsg) {
+       return sqlite3_exec(z->db, sql, callback, arg, errmsg);
+}
+
 int zpm_rollback(struct zpm *z) {
        char *errstr = 0;
        sqlite3_exec(z->db, "rollback;", NULL, NULL, &errstr);
@@ -288,12 +293,9 @@ int zpm_open(struct zpm *pkg, char *path) {
 
        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);
@@ -349,30 +351,51 @@ int zpm_close(struct zpm *pkg) {
        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 */
+       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);
+}
+
+int zpm_addvercmp(struct zpm *pkg) {
+       return sqlite3_create_collation(
+                       pkg->db, "vercmp", SQLITE_UTF8, NULL,
+                       zpm_sqlite_vercmp
+                       );
+}
+
 /* 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;
+       return av ? ac : 1;
 }
 
 int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
@@ -404,7 +427,7 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
                /* didn't find a row */
                sqlite3_finalize(ifile);
                sqlite3_close(db);
-               fprintf(stderr, "no such hash\n");
+               fprintf(stderr, "no such hash: %s\n", hash);
                return 0;
        }
        /* either way we're done with this now */
@@ -434,67 +457,26 @@ int zpm_extract(struct zpm *pkg, char *hash, char *path, int mode) {
        xzdata = (void *)sqlite3_column_blob(ifile, 1);
        blobsize = sqlite3_column_bytes(ifile, 1);
 
-       out = fopen(path, "w");
+       if (strcmp(path, "-")) {
+               out = fopen(path, "w");
+       } else {
+               out = stdout;
+       }
        if (!out) {
                fprintf(stderr, "can't open output file %s\n", path);
                sqlite3_finalize(ifile);
                sqlite3_close(db);
-               return 5;
+               return 0;
        }
        //fwrite(xzdata, blobsize, 1, stdout);
 
        //fprintf(stderr, "uncompressing %d bytes at %p, expect %lld\n", blobsize, xzdata, (long long int)size);
        uncompresslzma(xzdata, blobsize, out);
        fclose(out);
+       chmod(path, mode);
 
        sqlite3_finalize(ifile);
 
-       return 0;
-       
-}
-
-/* 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 1;
 }
 
@@ -577,57 +559,22 @@ static int set_elf_info(sqlite3 *db, char *hash, char *content, size_t length) {
                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");
                        }
                }
 
@@ -666,7 +613,9 @@ static int set_elf_info(sqlite3 *db, char *hash, char *content, size_t length) {
                                        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));
@@ -685,12 +634,12 @@ static int set_elf_info(sqlite3 *db, char *hash, char *content, size_t length) {
 }
 
 #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;
@@ -700,7 +649,7 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
        size_t outlen = 0;
        void *outbuf;
 
-       if (!pkg || !pkg->db || !path) {
+       if (!zpm || !zpm->db || !path) {
                return 0;
        }
 
@@ -709,15 +658,18 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
                hash = hashbuf;
        }
 
+       if (flags) {
+               fprintf(stderr, "zpm_import unused flags = %d\n", flags);
+       }
        /* 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;
        }
@@ -735,14 +687,14 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
                }
                /* 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;
        }
@@ -758,7 +710,7 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
        //fprintf(stderr, "file %s: %s\n", path, hash);
 
        /* TODO check null */
-       sqlite3 *db = pkg->db;
+       sqlite3 *db = zpm->db;
 
        /* prepare and bind */
 
@@ -779,7 +731,7 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
                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;
                }
@@ -819,7 +771,7 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
 
                /* start a transaction */
                // do that outside of here 
-               //zpm_begin(pkg);
+               //zpm_begin(zpm);
 
                /* insert */
                if (haverow) {
@@ -832,7 +784,7 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
                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;
                }
@@ -841,7 +793,7 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
                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;
                }
@@ -849,7 +801,7 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
                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;
                }
@@ -857,7 +809,7 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
                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;
                }
@@ -865,20 +817,20 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
                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;
@@ -887,7 +839,7 @@ int zpm_import(struct zpm *pkg, char *path, uint32_t flags, char *hash) {
        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 */
        }