Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace xbps_file_hash_check_dictionary #582

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Replace xbps_file_hash_check_dictionary #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
aa670a2
lib: add xbps_transaction_file_get
Duncaen Jan 10, 2024
33e81e7
lib: use xbps_transaction_file_get
Duncaen Jan 10, 2024
f231641
lib: remove xbps_file_hash_check_dictionary
Duncaen Jan 10, 2024
2dedfd1
lib: extend struct xbps_file to include a flag for conf files
Duncaen Jan 11, 2024
b1831a6
lib: replace xbps_entry_is_a_conf_file with XBPS_FILE_CONF flag
Duncaen Jan 11, 2024
91a63a1
lib: extend xbps_transaction_file_get to return old and new files
Duncaen Jan 11, 2024
15f6374
lib: clean rewrite of the configuration file handling
Duncaen Jan 11, 2024
06981f1
lib: remove xbps_entry_install_conf_file
Duncaen Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions include/xbps_api_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,19 @@

struct archive_entry;

enum xbps_file_flag {
XBPS_FILE_CONF = 1 << 0,
XBPS_FILE_ALTERNATIVE = 1 << 1,
};

struct xbps_file {
char *path;
uint64_t size;
enum xbps_file_flag flags;
char *sha256;
const char *target;
};

/**
* @private
*/
Expand All @@ -71,10 +84,6 @@ bool HIDDEN xbps_remove_pkg_from_array_by_pkgver(xbps_array_t, const char *);
void HIDDEN xbps_fetch_set_cache_connection(int, int);
void HIDDEN xbps_fetch_unset_cache_connection(void);
int HIDDEN xbps_cb_message(struct xbps_handle *, xbps_dictionary_t, const char *);
int HIDDEN xbps_entry_is_a_conf_file(xbps_dictionary_t, const char *);
int HIDDEN xbps_entry_install_conf_file(struct xbps_handle *, xbps_dictionary_t,
xbps_dictionary_t, struct archive_entry *, const char *,
const char *, bool);
xbps_dictionary_t HIDDEN xbps_find_virtualpkg_in_conf(struct xbps_handle *,
xbps_dictionary_t, const char *);
xbps_dictionary_t HIDDEN xbps_find_pkg_in_dict(xbps_dictionary_t, const char *);
Expand All @@ -94,15 +103,16 @@ bool HIDDEN xbps_transaction_store(struct xbps_handle *, xbps_array_t, xbps_dict
int HIDDEN xbps_transaction_init(struct xbps_handle *);
int HIDDEN xbps_transaction_files(struct xbps_handle *,
xbps_object_iterator_t);
void HIDDEN xbps_transaction_files_free(struct xbps_handle *);
int HIDDEN xbps_transaction_file_get(struct xbps_handle *xhp, const char *path,
const struct xbps_file **oldp, const struct xbps_file **newp);
int HIDDEN xbps_transaction_fetch(struct xbps_handle *,
xbps_object_iterator_t);
int HIDDEN xbps_transaction_pkg_deps(struct xbps_handle *, xbps_array_t, xbps_dictionary_t);
int HIDDEN xbps_transaction_internalize(struct xbps_handle *, xbps_object_iterator_t);

char HIDDEN *xbps_get_remote_repo_string(const char *);
int HIDDEN xbps_repo_sync(struct xbps_handle *, const char *);
int HIDDEN xbps_file_hash_check_dictionary(struct xbps_handle *,
xbps_dictionary_t, const char *, const char *);
int HIDDEN xbps_file_exec(struct xbps_handle *, const char *, ...);
void HIDDEN xbps_set_cb_fetch(struct xbps_handle *, off_t, off_t, off_t,
const char *, bool, bool, bool);
Expand Down
2 changes: 1 addition & 1 deletion lib/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ LIBFETCH_GEN = fetch/ftperr.h fetch/httperr.h
EXTOBJS = external/dewey.o external/fexec.o external/mkpath.o

# libxbps
OBJS = package_configure.o package_config_files.o package_orphans.o
OBJS = package_configure.o package_orphans.o
OBJS += package_remove.o package_state.o package_msg.o
OBJS += package_unpack.o package_register.o package_script.o verifysig.o
OBJS += transaction_commit.o transaction_prepare.o
Expand Down
248 changes: 0 additions & 248 deletions lib/package_config_files.c
View file
Open in desktop

This file was deleted.

Loading
Loading