summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/apk_database.h18
-rw-r--r--src/apk_package.h4
-rw-r--r--src/app_dot.c1
-rw-r--r--src/app_fetch.c8
-rw-r--r--src/app_info.c12
-rw-r--r--src/app_list.c1
-rw-r--r--src/app_manifest.c5
-rw-r--r--src/app_policy.c7
-rw-r--r--src/app_search.c44
-rw-r--r--src/database.c138
-rw-r--r--src/package.c16
11 files changed, 194 insertions, 60 deletions
diff --git a/src/apk_database.h b/src/apk_database.h
index bedc479..42f465d 100644
--- a/src/apk_database.h
+++ b/src/apk_database.h
@@ -103,6 +103,7 @@ struct apk_name {
unsigned priority : 2;
unsigned layer : 4;
unsigned solver_flags_set : 1;
+ unsigned providers_sorted : 1;
unsigned int foreach_genid;
union {
struct apk_solver_name_state ss;
@@ -193,6 +194,7 @@ typedef union apk_database_or_void {
static inline int apk_name_cmp_display(const struct apk_name *a, const struct apk_name *b) {
return strcmp(a->name, b->name);
}
+struct apk_provider_array *apk_name_sorted_providers(struct apk_name *);
struct apk_name *apk_db_get_name(struct apk_database *db, apk_blob_t name);
struct apk_name *apk_db_query_name(struct apk_database *db, apk_blob_t name);
@@ -260,6 +262,22 @@ int apk_db_foreach_matching_name(struct apk_database *db, struct apk_string_arra
int apk_db_foreach_sorted_name(struct apk_database *db, struct apk_string_array *filter,
apk_db_foreach_name_cb cb, void *ctx);
+typedef int (*apk_db_foreach_package_cb)(struct apk_database *db, const char *match, struct apk_package *pkg, void *ctx);
+
+int __apk_db_foreach_sorted_package(struct apk_database *db, struct apk_string_array *filter,
+ apk_db_foreach_package_cb cb, void *cb_ctx, int provides);
+
+static inline int apk_db_foreach_sorted_package(struct apk_database *db, struct apk_string_array *filter,
+ apk_db_foreach_package_cb cb, void *cb_ctx) {
+ return __apk_db_foreach_sorted_package(db, filter, cb, cb_ctx, 0);
+}
+
+static inline int apk_db_foreach_sorted_providers(struct apk_database *db, struct apk_string_array *filter,
+ apk_db_foreach_package_cb cb, void *cb_ctx) {
+ return __apk_db_foreach_sorted_package(db, filter, cb, cb_ctx, 1);
+}
+
+
static inline uint8_t apk_dbf_digest(struct apk_db_file *dbf)
{
uint8_t alg;
diff --git a/src/apk_package.h b/src/apk_package.h
index 8d9cba4..6cd6f91 100644
--- a/src/apk_package.h
+++ b/src/apk_package.h
@@ -91,6 +91,7 @@ struct apk_package {
time_t build_time;
unsigned short provider_priority;
unsigned repos : APK_MAX_REPOS;
+ unsigned seen : 1;
unsigned marked : 1;
unsigned uninstallable : 1;
unsigned cached_non_repository : 1;
@@ -158,7 +159,8 @@ void apk_ipkg_run_script(struct apk_installed_package *ipkg, struct apk_database
struct apk_package *apk_pkg_parse_index_entry(struct apk_database *db, apk_blob_t entry);
int apk_pkg_write_index_entry(struct apk_package *pkg, struct apk_ostream *os);
-int apk_pkg_version_compare(struct apk_package *a, struct apk_package *b);
+int apk_pkg_version_compare(const struct apk_package *a, const struct apk_package *b);
+int apk_pkg_cmp_display(const struct apk_package *a, const struct apk_package *b);
unsigned int apk_foreach_genid(void);
int apk_pkg_match_genid(struct apk_package *pkg, unsigned int match);
diff --git a/src/app_dot.c b/src/app_dot.c
index 5cd72f1..da12919 100644
--- a/src/app_dot.c
+++ b/src/app_dot.c
@@ -139,6 +139,7 @@ static int dump(struct apk_database *db, const char *match, struct apk_name *nam
if (!name) return 0;
+ apk_name_sorted_providers(name);
foreach_array_item(p, name->providers)
dump_pkg(ctx, p->pkg);
return 0;
diff --git a/src/app_fetch.c b/src/app_fetch.c
index 3466ecb..54f3e47 100644
--- a/src/app_fetch.c
+++ b/src/app_fetch.c
@@ -124,12 +124,10 @@ static void progress_cb(void *pctx, size_t bytes_done)
apk_print_progress(&ctx->prog, ctx->done + bytes_done, ctx->total);
}
-static int fetch_package(apk_hash_item item, void *pctx)
+static int fetch_package(struct apk_database *db, const char *match, struct apk_package *pkg, void *pctx)
{
- struct fetch_ctx *ctx = (struct fetch_ctx *) pctx;
- struct apk_database *db = ctx->db;
+ struct fetch_ctx *ctx = pctx;
struct apk_out *out = &db->ctx->out;
- struct apk_package *pkg = (struct apk_package *) item;
struct apk_istream *is;
struct apk_ostream *os;
struct apk_repository *repo;
@@ -355,7 +353,7 @@ static int fetch_main(void *pctx, struct apk_ctx *ac, struct apk_string_array *a
apk_db_foreach_matching_name(db, args, mark_name, ctx);
}
if (!ctx->errors)
- apk_hash_foreach(&db->available.packages, fetch_package, ctx);
+ apk_db_foreach_sorted_package(db, NULL, fetch_package, ctx);
/* Remove packages not matching download spec from the output directory */
if (!ctx->errors && (db->ctx->flags & APK_PURGE) &&
diff --git a/src/app_info.c b/src/app_info.c
index 0336300..fb597d8 100644
--- a/src/app_info.c
+++ b/src/app_info.c
@@ -346,18 +346,16 @@ static void info_subaction(struct info_ctx *ctx, struct apk_package *pkg)
}
}
-static int print_name_info(struct apk_database *db, const char *match, struct apk_name *name, void *pctx)
+static int print_name_info(struct apk_database *db, const char *match, struct apk_package *pkg, void *pctx)
{
struct info_ctx *ctx = (struct info_ctx *) pctx;
- struct apk_provider *p;
- if (name == NULL) {
+ if (!pkg) {
ctx->errors++;
return 0;
}
- foreach_array_item(p, name->providers)
- info_subaction(ctx, p->pkg);
+ info_subaction(ctx, pkg);
return 0;
}
@@ -453,8 +451,8 @@ static int info_main(void *ctx, struct apk_ctx *ac, struct apk_string_array *arg
if (ictx->action != NULL) {
ictx->action(ictx, db, args);
} else if (args->num > 0) {
- /* Print info on given names */
- apk_db_foreach_sorted_name(db, args, print_name_info, ctx);
+ /* Print info on given packages */
+ apk_db_foreach_sorted_providers(db, args, print_name_info, ctx);
} else {
/* Print all installed packages */
list_for_each_entry(ipkg, &db->installed.packages, installed_pkgs_list)
diff --git a/src/app_list.c b/src/app_list.c
index 713950e..d15de94 100644
--- a/src/app_list.c
+++ b/src/app_list.c
@@ -172,6 +172,7 @@ static int print_result(struct apk_database *db, const char *match, struct apk_n
if (!name) return 0;
+ apk_name_sorted_providers(name);
if (ctx->match_depends) {
foreach_array_item(pname, name->rdepends)
iterate_providers(*pname, ctx);
diff --git a/src/app_manifest.c b/src/app_manifest.c
index 601f856..5caf7ba 100644
--- a/src/app_manifest.c
+++ b/src/app_manifest.c
@@ -160,8 +160,11 @@ static int process_match(struct apk_database *db, const char *match, struct apk_
return 0;
}
- foreach_array_item(p, name->providers)
+ apk_name_sorted_providers(name);
+ foreach_array_item(p, name->providers) {
+ if (p->pkg->name != name) continue;
process_package(db, p->pkg);
+ }
return 0;
}
diff --git a/src/app_policy.c b/src/app_policy.c
index 7f263f6..cf4e2c3 100644
--- a/src/app_policy.c
+++ b/src/app_policy.c
@@ -36,11 +36,10 @@ zlib1g policy:
1.1:
http://nl.alpinelinux.org/alpine/v2.4/main
*/
+ apk_name_sorted_providers(name);
foreach_array_item(p, name->providers) {
- if (p->pkg->name != name)
- continue;
- if (num++ == 0)
- apk_out(out, "%s policy:", name->name);
+ if (p->pkg->name != name) continue;
+ if (num++ == 0) apk_out(out, "%s policy:", name->name);
apk_out(out, " " BLOB_FMT ":", BLOB_PRINTF(*p->version));
if (p->pkg->ipkg)
apk_out(out, " %s/installed", apk_db_layer_name(p->pkg->layer));
diff --git a/src/app_search.c b/src/app_search.c
index 48b19d5..1dcb7b6 100644
--- a/src/app_search.c
+++ b/src/app_search.c
@@ -26,18 +26,11 @@ struct search_ctx {
unsigned int matches;
struct apk_string_array *filter;
+ struct apk_package *prev_match;
};
-static int unique_match(struct apk_package *pkg)
-{
- if (pkg->state_int) return 0;
- pkg->state_int = 1;
- return 1;
-}
-
static void print_package_name(struct search_ctx *ctx, struct apk_package *pkg)
{
- if (!unique_match(pkg)) return;
printf("%s", pkg->name->name);
if (ctx->verbosity > 0)
printf("-" BLOB_FMT, BLOB_PRINTF(*pkg->version));
@@ -48,7 +41,6 @@ static void print_package_name(struct search_ctx *ctx, struct apk_package *pkg)
static void print_origin_name(struct search_ctx *ctx, struct apk_package *pkg)
{
- if (!unique_match(pkg)) return;
if (pkg->origin != NULL)
printf(BLOB_FMT, BLOB_PRINTF(*pkg->origin));
else
@@ -144,26 +136,28 @@ match:
ctx->print_result(ctx, pkg);
}
-static int print_result(struct apk_database *db, const char *match, struct apk_name *name, void *pctx)
+static int print_result(struct apk_database *db, const char *match, struct apk_package *pkg, void *pctx)
{
struct search_ctx *ctx = pctx;
- struct apk_provider *p;
- struct apk_package *pkg = NULL;
- if (!name) return 0;
+ if (!pkg) return 0;
if (ctx->show_all) {
- foreach_array_item(p, name->providers)
- print_result_pkg(ctx, p->pkg);
- } else {
- foreach_array_item(p, name->providers) {
- if (pkg == NULL ||
- apk_version_compare_blob(*p->version, *pkg->version) == APK_VERSION_GREATER)
- pkg = p->pkg;
- }
- if (pkg)
- print_result_pkg(ctx, pkg);
+ print_result_pkg(ctx, pkg);
+ return 0;
}
+
+ if (!ctx->prev_match) {
+ ctx->prev_match = pkg;
+ return 0;
+ }
+ if (ctx->prev_match->name != pkg->name) {
+ print_result_pkg(ctx, ctx->prev_match);
+ ctx->prev_match = pkg;
+ return 0;
+ }
+ if (apk_pkg_version_compare(pkg, ctx->prev_match) == APK_VERSION_GREATER)
+ ctx->prev_match = pkg;
return 0;
}
@@ -194,7 +188,9 @@ static int search_main(void *pctx, struct apk_ctx *ac, struct apk_string_array *
*pmatch = tmp;
}
}
- apk_db_foreach_sorted_name(db, args, print_result, ctx);
+ apk_db_foreach_sorted_providers(db, args, print_result, ctx);
+ if (ctx->prev_match) print_result_pkg(ctx, ctx->prev_match);
+
return 0;
}
diff --git a/src/database.c b/src/database.c
index bbb9308..e8865b1 100644
--- a/src/database.c
+++ b/src/database.c
@@ -227,6 +227,21 @@ struct apk_name *apk_db_get_name(struct apk_database *db, apk_blob_t name)
return pn;
}
+static int cmp_provider(const void *a, const void *b)
+{
+ const struct apk_provider *pa = a, *pb = b;
+ return apk_pkg_cmp_display(pa->pkg, pb->pkg);
+}
+
+struct apk_provider_array *apk_name_sorted_providers(struct apk_name *name)
+{
+ if (!name->providers_sorted) {
+ qsort(name->providers->item, name->providers->num, sizeof name->providers->item[0], cmp_provider);
+ name->providers_sorted = 0;
+ }
+ return name->providers;
+}
+
static struct apk_db_acl *__apk_db_acl_atomize(struct apk_database *db, mode_t mode, uid_t uid, gid_t gid, uint8_t csum_type, const uint8_t *csum_data)
{
struct apk_db_acl acl = { .mode = mode & 07777, .uid = uid, .gid = gid };
@@ -3103,20 +3118,48 @@ struct match_ctx {
void *cb_ctx;
};
-static int match_names(apk_hash_item item, void *pctx)
+static int apk_string_match(const char *str, struct apk_string_array *filter, const char **res)
{
- struct match_ctx *ctx = (struct match_ctx *) pctx;
- struct apk_name *name = (struct apk_name *) item;
char **pmatch;
- if (!ctx->filter)
- return ctx->cb(ctx->db, NULL, name, ctx->cb_ctx);
+ foreach_array_item(pmatch, filter) {
+ if (fnmatch(*pmatch, str, 0) == 0) {
+ *res = *pmatch;
+ return 1;
+ }
+ }
+ return 0;
+}
+
+static int apk_name_match(struct apk_name *name, struct apk_string_array *filter, const char **res)
+{
+ if (!filter) {
+ *res = NULL;
+ return 1;
+ }
+ return apk_string_match(name->name, filter, res);
+}
+
+static int apk_pkg_match(struct apk_package *pkg, struct apk_string_array *filter, const char **res, int provides)
+{
+ struct apk_dependency *d;
- foreach_array_item(pmatch, ctx->filter) {
- if (fnmatch(*pmatch, name->name, 0) == 0)
- return ctx->cb(ctx->db, *pmatch, name, ctx->cb_ctx);
+ if (apk_name_match(pkg->name, filter, res)) return 1;
+ if (!provides) return 0;
+ foreach_array_item(d, pkg->provides) {
+ if (apk_string_match(d->name->name, filter, res)) return 1;
}
+ return 0;
+}
+static int match_names(apk_hash_item item, void *pctx)
+{
+ struct match_ctx *ctx = (struct match_ctx *) pctx;
+ struct apk_name *name = (struct apk_name *) item;
+ const char *match;
+
+ if (apk_name_match(name, ctx->filter, &match))
+ return ctx->cb(ctx->db, match, name, ctx->cb_ctx);
return 0;
}
@@ -3157,6 +3200,12 @@ static int cmp_name(const void *a, const void *b)
return apk_name_cmp_display(*na, *nb);
}
+static int cmp_package(const void *a, const void *b)
+{
+ const struct apk_package * const* pa = a, * const* pb = b;
+ return apk_pkg_cmp_display(*pa, *pb);
+}
+
struct add_name_ctx {
struct apk_name_array *a;
size_t i;
@@ -3190,6 +3239,7 @@ int apk_db_foreach_sorted_name(struct apk_database *db, struct apk_string_array
{
int r, walk_all = 0;
char **pmatch;
+ const char *match;
struct apk_name *name;
struct apk_name *results[128], **res;
size_t i, num_res = 0;
@@ -3228,17 +3278,71 @@ int apk_db_foreach_sorted_name(struct apk_database *db, struct apk_string_array
for (i = 0; i < num_res; i++) {
name = res[i];
- if (!filter) {
- r = cb(db, NULL, name, cb_ctx);
- } else {
- foreach_array_item(pmatch, filter) {
- if (fnmatch(*pmatch, name->name, 0) == 0) {
- r = cb(db, *pmatch, name, cb_ctx);
- break;
- }
+ if (apk_name_match(name, filter, &match)) {
+ r = cb(db, match, name, cb_ctx);
+ if (r) return r;
+ }
+ }
+ return 0;
+}
+
+int __apk_db_foreach_sorted_package(struct apk_database *db, struct apk_string_array *filter,
+ apk_db_foreach_package_cb cb, void *cb_ctx, int provides)
+{
+ char **pmatch;
+ const char *match;
+ struct apk_name *name;
+ struct apk_package *results[128];
+ struct apk_provider *p;
+ size_t i, num_res = 0;
+ int r;
+
+ if (!filter || !filter->num) {
+ filter = NULL;
+ goto walk_all;
+ }
+
+ foreach_array_item(pmatch, filter) {
+ name = (struct apk_name *) apk_hash_get(&db->available.names, APK_BLOB_STR(*pmatch));
+ if (strchr(*pmatch, '*')) goto walk_all;
+ if (!name) {
+ cb(db, *pmatch, NULL, cb_ctx);
+ continue;
+ }
+
+ foreach_array_item(p, name->providers) {
+ if (!provides && p->pkg->name != name) continue;
+ if (p->pkg->seen) continue;
+ p->pkg->seen = 1;
+ if (num_res >= ARRAY_SIZE(results)) goto walk_all;
+ results[num_res++] = p->pkg;
+ }
+ }
+ for (i = 0; i < num_res; i++) results[i]->seen = 0;
+
+ qsort(results, num_res, sizeof results[0], cmp_package);
+ for (i = 0; i < num_res; i++) {
+ if (apk_pkg_match(results[i], filter, &match, provides)) {
+ r = cb(db, match, results[i], cb_ctx);
+ if (r) return r;
+ }
+ }
+ return 0;
+
+walk_all:
+ for (i = 0; i < num_res; i++) results[i]->seen = 0;
+
+ struct apk_name_array *a = apk_db_sorted_names(db);
+ for (i = 0; i < a->num; i++) {
+ name = a->item[i];
+ apk_name_sorted_providers(name);
+ foreach_array_item(p, name->providers) {
+ if (p->pkg->name != name) continue;
+ if (apk_pkg_match(p->pkg, filter, &match, provides)) {
+ r = cb(db, match, p->pkg, cb_ctx);
+ if (r) return r;
}
}
- if (r) return r;
}
return 0;
}
diff --git a/src/package.c b/src/package.c
index 86ea088..7fe2672 100644
--- a/src/package.c
+++ b/src/package.c
@@ -963,7 +963,7 @@ int apk_pkg_write_index_entry(struct apk_package *info,
return 0;
}
-int apk_pkg_version_compare(struct apk_package *a, struct apk_package *b)
+int apk_pkg_version_compare(const struct apk_package *a, const struct apk_package *b)
{
if (a->version == b->version)
return APK_VERSION_EQUAL;
@@ -971,6 +971,20 @@ int apk_pkg_version_compare(struct apk_package *a, struct apk_package *b)
return apk_version_compare_blob(*a->version, *b->version);
}
+int apk_pkg_cmp_display(const struct apk_package *a, const struct apk_package *b)
+{
+ if (a->name != b->name)
+ return apk_name_cmp_display(a->name, b->name);
+ switch (apk_pkg_version_compare(a, b)) {
+ case APK_VERSION_LESS:
+ return -1;
+ case APK_VERSION_GREATER:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
unsigned int apk_foreach_genid(void)
{
static unsigned int foreach_genid;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-01-05 01:40:04 +0000