fix compile process for elf programs

[zpackage] / zpm.h

diff --git a/zpm.h b/zpm.h
index 64e5ac63ec9c49437cc2b4da2310111aa724d85c..6cca0575c27c52d2a86e1df831806bfd326ad0f5 100644 (file)
--- a/zpm.h
+++ b/zpm.h
@@ -6,8 +6,10 @@
 #include <time.h>
 #include <limits.h>
 #include <stdarg.h>
+#include <sys/types.h>
 
-#include <sqlite3.h>
+#include "sqlite3.h"
+#include "lib/jsw/jsw_atree.h"
 
 #define ZPM_HASH_STRLEN 64
 
@@ -52,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 */
@@ -75,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 */
 };
 
@@ -114,7 +136,7 @@ int zpm_tag(struct zpm *zp, char *path, char *tags);
 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);
+int zpm_extract(struct zpm *pkg, char *hash, char *path, mode_t mode);
 
 /* export path to dest */
 int zpm_export(struct zpm *zp, char *path, uint32_t flags, char *dest);
@@ -156,10 +178,8 @@ int zpm_checkinstall(struct zpm *local);
 
 int zpm_merge(struct zpm *z, struct zpm *src, uint32_t flags);
 
-#if 1
-void uncompresslzma(void *buf, size_t bufsize, FILE *out);
+ssize_t uncompresslzma(void *buf, size_t bufsize, int outfd);
 void *compresslzma(void *buf, size_t bufsize, size_t *len);
-#endif
 
 #define SQLERROR(x) fprintf(stderr, "%s %d: %s\n", __func__, __LINE__, (x))
 int zpm_hash(char *path, char *hash, uint32_t flags);
@@ -176,14 +196,50 @@ 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);
 
 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, ...);
+void zpm_seterror(struct zpm *zpm, char *msgfmt, ...);
 
 struct zpm *zpm_clearmem(struct zpm *zpm);
 
+struct zpm_note {
+       int64_t id;
+       char *ts; /* applications can parse it if they need to */
+       char *note;
+       char *pkgid;
+       char *path;
+       char *file;
+       char *hash;
+       int ack;
+};
+
+void zpm_note_ack(struct zpm *zpm, int64_t note);
+void zpm_note_unack(struct zpm *zpm, int64_t note);
+void zpm_note_del(struct zpm *zpm, int64_t note);
+int64_t zpm_note(struct zpm *zpm, struct zpm_note *n, unsigned int flags);
+void zpm_note_free(struct zpm_note *n);
+int zpm_notes(struct zpm *zpm, int n, struct zpm_note *note);
+int64_t zpm_note_next(struct zpm *zpm, struct zpm_note *n);
+int64_t zpm_note_add(struct zpm *zpm, char *pkgid, char *path, char *filehash,
+               char *notefmt, ...);
+int zpm_notes_available(struct zpm *zpm, int flags);
+
 #endif