X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libopkg%2Fpkg.h;h=cf405b15e8148d281f6e75438f1ee800a671d978;hb=23d31fbb7c6dee44226443c04f556c947f3985c1;hp=ad4bba5368bbaac2ba33831d35527bd67a24c8e4;hpb=4ea955bc7e5575bc1d8b34c364591c47653f2cfd;p=oweals%2Fopkg-lede.git diff --git a/libopkg/pkg.h b/libopkg/pkg.h index ad4bba5..cf405b1 100644 --- a/libopkg/pkg.h +++ b/libopkg/pkg.h @@ -18,9 +18,8 @@ #ifndef PKG_H #define PKG_H -#include "config.h" - #include +#include #include "pkg_vec.h" #include "str_list.h" @@ -32,7 +31,9 @@ struct opkg_conf; +#ifndef ARRAY_SIZE #define ARRAY_SIZE(array) sizeof(array) / sizeof((array)[0]) +#endif /* I think "Size" is currently the shortest field name */ #define PKG_MINIMUM_FIELD_NAME_LEN 4 @@ -57,6 +58,7 @@ enum pkg_state_flag { SF_MARKED = 64, /* temporary mark */ SF_FILELIST_CHANGED = 128, /* needs filelist written */ SF_USER = 256, + SF_NEED_DETAIL = 512, SF_LAST_STATE_FLAG }; typedef enum pkg_state_flag pkg_state_flag_t; @@ -75,6 +77,31 @@ enum pkg_state_status { }; typedef enum pkg_state_status pkg_state_status_t; +enum pkg_fields { + PKG_MAINTAINER, + PKG_PRIORITY, + PKG_SOURCE, + PKG_TAGS, + PKG_SECTION, + PKG_EPOCH, + PKG_FILENAME, + PKG_LOCAL_FILENAME, + PKG_VERSION, + PKG_REVISION, + PKG_DESCRIPTION, + PKG_MD5SUM, + PKG_SHA256SUM, + PKG_SIZE, + PKG_INSTALLED_SIZE, + PKG_INSTALLED_TIME, + PKG_TMP_UNPACK_DIR, + PKG_REPLACES, + PKG_PROVIDES, + PKG_DEPENDS, + PKG_CONFLICTS, + PKG_CONFFILES, +}; + struct abstract_pkg { char *name; int dependencies_checked; @@ -113,57 +140,14 @@ struct abstract_pkg { we don't often free them. */ struct pkg { char *name; - unsigned long epoch; - char *version; - char *revision; pkg_src_t *src; pkg_dest_t *dest; - char *architecture; - char *section; - char *maintainer; - char *description; - char *tags; - pkg_state_want_t state_want; - pkg_state_flag_t state_flag; - pkg_state_status_t state_status; - char **depends_str; - unsigned int depends_count; - char **pre_depends_str; - unsigned int pre_depends_count; - char **recommends_str; - unsigned int recommends_count; - char **suggests_str; - unsigned int suggests_count; - struct active_list list; /* Used for installing|upgrading */ - compound_depend_t *depends; - - char **conflicts_str; - compound_depend_t *conflicts; - unsigned int conflicts_count; - - char **replaces_str; - unsigned int replaces_count; - abstract_pkg_t **replaces; - - char **provides_str; - unsigned int provides_count; - abstract_pkg_t **provides; + pkg_state_want_t state_want:3; + pkg_state_flag_t state_flag:11; + pkg_state_status_t state_status:4; abstract_pkg_t *parent; - char *filename; - char *local_filename; - char *tmp_unpack_dir; - char *md5sum; -#if defined HAVE_SHA256 - char *sha256sum; -#endif - unsigned long size; /* in bytes */ - unsigned long installed_size; /* in bytes */ - char *priority; - char *source; - conffile_list_t conffiles; - time_t installed_time; /* As pointer for lazy evaluation */ str_list_t *installed_files; /* XXX: CLEANUP: I'd like to perhaps come up with a better @@ -171,20 +155,69 @@ struct pkg { installed_files list was being freed from an inner loop while still being used within an outer loop. */ int installed_files_ref_cnt; - int essential; - int arch_priority; + + unsigned int essential:1; /* Adding this flag, to "force" opkg to choose a "provided_by_hand" package, if there are multiple choice */ - int provided_by_hand; + unsigned int provided_by_hand:1; /* this flag specifies whether the package was installed to satisfy another * package's dependancies */ - int auto_installed; - int is_upgrade; + unsigned int auto_installed:1; + unsigned int is_upgrade:1; + + unsigned int arch_index:3; + + struct blob_buf blob; }; pkg_t *pkg_new(void); void pkg_deinit(pkg_t * pkg); int pkg_init_from_file(pkg_t * pkg, const char *filename); + +void *pkg_set_raw(pkg_t *pkg, int id, const void *val, size_t len); +void *pkg_get_raw(const pkg_t *pkg, int id); + +static inline int pkg_set_int(pkg_t *pkg, int id, int val) +{ + int *res = pkg_set_raw(pkg, id, &val, sizeof(val)); + return res ? *res : 0; +} + +static inline int pkg_get_int(const pkg_t *pkg, int id) +{ + int *ptr = pkg_get_raw(pkg, id); + return ptr ? *ptr : 0; +} + +char *pkg_set_string(pkg_t *pkg, int id, const char *s); + +static inline char *pkg_get_string(const pkg_t *pkg, int id) +{ + return (char *) pkg_get_raw(pkg, id); +} + +static inline void * pkg_set_ptr(pkg_t *pkg, int id, void *ptr) +{ + void **res = pkg_set_raw(pkg, id, &ptr, sizeof(ptr)); + return res ? *res : NULL; +} + +static inline void * pkg_get_ptr(const pkg_t *pkg, int id) +{ + void **ptr = pkg_get_raw(pkg, id); + return ptr ? *ptr : NULL; +} + +char *pkg_set_architecture(pkg_t *pkg, const char *architecture, ssize_t len); +char *pkg_get_architecture(const pkg_t *pkg); +int pkg_get_arch_priority(const pkg_t *pkg); + +char *pkg_get_md5(const pkg_t *pkg); +char *pkg_set_md5(pkg_t *pkg, const char *cksum); + +char *pkg_get_sha256(const pkg_t *pkg); +char *pkg_set_sha256(pkg_t *pkg, const char *cksum); + abstract_pkg_t *abstract_pkg_new(void); /* @@ -195,15 +228,13 @@ int pkg_merge(pkg_t * oldpkg, pkg_t * newpkg); char *pkg_version_str_alloc(pkg_t * pkg); -int pkg_compare_versions(const pkg_t * pkg, const pkg_t * ref_pkg); +int pkg_compare_versions(const pkg_t *pkg, const pkg_t *ref_pkg); int pkg_name_version_and_architecture_compare(const void *a, const void *b); int abstract_pkg_name_compare(const void *a, const void *b); void pkg_formatted_info(FILE * fp, pkg_t * pkg); void pkg_formatted_field(FILE * fp, pkg_t * pkg, const char *field); -void set_flags_from_control(pkg_t * pkg); - void pkg_print_status(pkg_t * pkg, FILE * file); str_list_t *pkg_get_installed_files(pkg_t * pkg); void pkg_free_installed_files(pkg_t * pkg);