remove stray debug fprintf

[zpackage] / zpm.h

diff --git a/zpm.h b/zpm.h
index adc69bba4376d03459d656ac70bf5a05d20e1c7e..3d54308ebdfa576155d15a18aab393b17e84f1fa 100644 (file)
--- a/zpm.h
+++ b/zpm.h
@@ -7,8 +7,11 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
-#include <sqlite3.h>
+#include "sqlite3.h"
+#include "lib/jsw/jsw_atree.h"
 
 #define ZPM_HASH_STRLEN 64
 
@@ -40,6 +43,14 @@ struct zpm {
        struct zpm_package *current_package;
 };
 
+struct zpm_stat {
+       struct stat st;
+       int configuration;
+       char hash[65]; /* length + room for a nul byte */
+       char diskhash[65]; /* hash of actual file on disk */
+       char *target; /* malloced link target */
+};
+
 struct zpm_dependency {
        char minpkg[ZPM_PACKAGE_ID_MAX+1];
        char maxpkg[ZPM_PACKAGE_ID_MAX+1];
@@ -53,7 +64,7 @@ struct zpm_tag {
 
 struct zpm_package {
        struct zpm *zpm;
-       struct jsw_hash *ht;
+       struct jsw_hash_t *ht;
 
        /* char pointers are just pointers into the hash table */
        /* integers/times and such are passed through atoi */
@@ -77,16 +88,38 @@ struct zpm_package {
 
 int zpm_parse_package(char *pstr, char *name, char *ver, int *rel);
 char *zpm_findpkg(struct zpm *zpm, char *pkgstr, char *where);
+char *zpm_findpkg_range(struct zpm *zpm, char *minpkg, char *maxpkg, char *where, int wantleast);
+int zpm_findhash(struct zpm *zpm, char *find, char *dest);
+char *zpm_findlib(struct zpm *zpm, char *soname, char *where);
+int zpm_libraries_needed(struct zpm *zpm, char *pkgid, jsw_atree_t *list); 
+int zpm_packages_needed(struct zpm *zpm, char *pkgid, jsw_atree_t *list);
 int zpm_quote(char *value, char *dest, size_t n);
 
 struct zpm_file {
-       char path[ZPM_PATH_MAX];
-       int mode;
+       char *package;
+       char *version;
+       int release;
+
+       char *status;
+       char *path;
+       char *target;
+
+       mode_t mode;
+
        //struct zpm_tree *tags;
-       char owner[32];
-       char group[32];
+       
+       char *owner;
+       char *group;
+       gid_t gid;
+       uid_t uid;
+
+       int configuration;
        time_t mtime;
+       char type;
+       dev_t device;
        char hash[ZPM_HASH_STRLEN+1];
+       char confhash[ZPM_HASH_STRLEN+1];
+       void *data; /* hook for applications to attach data */
        struct zpm_file *next; /* so you can make a linked list */
 };
 
@@ -132,8 +165,9 @@ 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);
+//int zpm_newpkg(struct zpm *z, char *base, char *version, int release);
+int zpm_create_package(struct zpm *zpm, char *name, char *ver, int rel); 
+int zpm_create_pkgid(struct zpm *zpm, char *pkgstr);
 
 /* transactions */
 int zpm_begin(struct zpm *z);
@@ -158,44 +192,71 @@ int zpm_checkinstall(struct zpm *local);
 int zpm_merge(struct zpm *z, struct zpm *src, uint32_t flags);
 
 ssize_t uncompresslzma(void *buf, size_t bufsize, int outfd);
+ssize_t zpm_uncompress_cb(void *buf, size_t bufsize, void *cbdata,
+               int (*cb)(void *ud, void *buf, size_t bufsize));
 void *compresslzma(void *buf, size_t bufsize, size_t *len);
 
 #define SQLERROR(x) fprintf(stderr, "%s %d: %s\n", __func__, __LINE__, (x))
 int zpm_hash(char *path, char *hash, uint32_t flags);
+
+/* hex encoded hash, not null terminated */
+int zpm_hash_mem(void *mem, size_t size, char *hash); 
+
 int zpm_readopts(struct zpm *pkg, int ac, char **av);
 
+struct zpm_version_info {
+       const char *verstr;
+       const char *name; int namelen;
+       const char *version; int verlen;
+       const char *relstr; int rellen;
+       int release;
+};
+
+int zpm_parse_version(const char *pstr, struct zpm_version_info *info);
 int zpm_vercmp(const char *a, const char *b);
 
 /* add vercmp collation to db */
 int zpm_addvercmp(struct zpm *pkg);
 
+/* return 1 if database is readonly, 0 if readwrite, or not connected */
+int zpm_readonly(struct zpm *z);
+
 int zpm_exec(struct zpm *z, const char *sql, int(*callback)(void *, int, char **, char**), void *arg, char **errmsg);
 
 int zpm_foreach_path(struct zpm *zpm, char *pkgid, char *where,
 int (*callback)(void *f, int ncols, char **vals, char **cols),
 void *data, char **errmsg);
+
+int zpm_foreach_path_ds(struct zpm *zpm, char *pkgid, char *where,
+int (*callback)(struct zpm *, struct zpm_file *, void *), void *cbd);
+
 int zpm_foreach_package(struct zpm *zpm, char *where,
 int (*callback)(void *cbdata, int ncols, char **vals, char **cols),
 void *data, char **errmsg);
 
 int zpm_script_hash(struct zpm *zpm, char *pkgstr, char *phase, char *hash);
 int zpm_script_set(struct zpm *zpm, char *pkgstr, char *phase, char *hash);
+int zpm_foreach_script(struct zpm *zpm, char *pkgstr, char *stage, void *cbd,
+               int (*cb)(void *ud, const char *pkg, const char *stage, const char *hash));
 
 int zpm_package_hash(struct zpm *zpm, char *pkgid, char *hash);
 int zpm_package_sethash(struct zpm *zpm, char *pkgid, char *hash);
+int zpm_package_checkhash(struct zpm *zpm, char *pkgid, char *hash);
+char *zpm_package_gethash(struct zpm *zpm, char *pkgid, char *hash);
+int zpm_package_clearhash(struct zpm *zpm, char *pkgid);
 
 sqlite3_stmt *zpm_dbqueryv(struct zpm *zpm, char *query, va_list args);
 sqlite3_stmt *zpm_dbquery(struct zpm *zpm, char *query, ...);
 char *zpm_db_string(struct zpm *zpm, char *query, ...);
 int zpm_db_int(struct zpm *zpm, char *query, ...);
-void zpm_db_run(struct zpm *zpm, char *query, ...);
+int zpm_db_run(struct zpm *zpm, char *query, ...);
 void zpm_seterror(struct zpm *zpm, char *msgfmt, ...);
 
 struct zpm *zpm_clearmem(struct zpm *zpm);
 
 struct zpm_note {
        int64_t id;
-       time_t ts; /* or timespec */
+       char *ts; /* applications can parse it if they need to */
        char *note;
        char *pkgid;
        char *path;