fix compile process for elf programs

[zpackage] / zpm.h

diff --git a/zpm.h b/zpm.h
index f9e7b3391a8d725094e8127de6ba9f55a64c98d3..6cca0575c27c52d2a86e1df831806bfd326ad0f5 100644 (file)
--- a/zpm.h
+++ b/zpm.h
@@ -8,7 +8,8 @@
 #include <stdarg.h>
 #include <sys/types.h>
 
-#include <sqlite3.h>
+#include "sqlite3.h"
+#include "lib/jsw/jsw_atree.h"
 
 #define ZPM_HASH_STRLEN 64
 
@@ -53,7 +54,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 */
@@ -76,17 +77,37 @@ struct zpm_package {
 };
 
 int zpm_parse_package(char *pstr, char *name, char *ver, int *rel);
-char *zpm_findpkg(struct zpm *zpm, char *pkgstr);
+char *zpm_findpkg(struct zpm *zpm, char *pkgstr, char *where);
+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_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 */
 };
 
@@ -175,8 +196,17 @@ 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);
@@ -192,7 +222,7 @@ 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;