diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2020-10-09 12:44:32 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2020-10-09 16:09:19 +0300 |
| commit | a627ab8eb8387ebf5735cf525ae72bfa159aa39a (patch) | |
| tree | 6c11a133c2743d03c4b4bc8be0f9cb42819aaee7 /src/app_adbsign.c | |
| parent | 354713d2f746c197eed6a1feb4c6af3420af6c15 (diff) | |
| download | apk-tools-a627ab8eb8387ebf5735cf525ae72bfa159aa39a.tar.gz apk-tools-a627ab8eb8387ebf5735cf525ae72bfa159aa39a.tar.bz2 apk-tools-a627ab8eb8387ebf5735cf525ae72bfa159aa39a.tar.xz apk-tools-a627ab8eb8387ebf5735cf525ae72bfa159aa39a.zip | |
make apk_database optional for applets that don't need it
The new v3 applets don't use it, and eventually all applets will
use the new formats only.
This prepares the code for this, and moves trust, id_cache, and
root_fd to apk_ctx which is enough for v3 applets at this time.
The generic code is made to not initialize apk_database if it's
not needed.
Diffstat (limited to 'src/app_adbsign.c')
| -rw-r--r-- | src/app_adbsign.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/app_adbsign.c b/src/app_adbsign.c index ddcf0c1..120f702 100644 --- a/src/app_adbsign.c +++ b/src/app_adbsign.c @@ -8,8 +8,8 @@ #include "apk_print.h" struct sign_ctx { + struct apk_ctx *ac; struct adb_xfrm xfrm; - struct apk_database *db; int reset_signatures : 1; int signatures_written : 1; }; @@ -41,6 +41,7 @@ static const struct apk_option_group optgroup_applet = { static int update_signatures(struct adb_xfrm *xfrm, struct adb_block *blk, struct apk_istream *is) { struct sign_ctx *ctx = container_of(xfrm, struct sign_ctx, xfrm); + struct adb_trust *trust = apk_ctx_get_trust(ctx->ac); int r; switch (blk ? ADB_BLOCK_TYPE(blk) : -1) { @@ -53,7 +54,7 @@ static int update_signatures(struct adb_xfrm *xfrm, struct adb_block *blk, struc default: if (!ctx->signatures_written) { ctx->signatures_written = 1; - r = adb_trust_write_signatures(&ctx->db->trust, &xfrm->db, &xfrm->vfy, xfrm->os); + r = adb_trust_write_signatures(trust, &xfrm->db, &xfrm->vfy, xfrm->os); if (r) return r; } if (!blk) break; @@ -62,14 +63,14 @@ static int update_signatures(struct adb_xfrm *xfrm, struct adb_block *blk, struc return 0; } -static int adbsign_main(void *pctx, struct apk_database *db, struct apk_string_array *args) +static int adbsign_main(void *pctx, struct apk_ctx *ac, struct apk_string_array *args) { - struct apk_out *out = &db->ctx->out; + struct apk_out *out = &ac->out; struct sign_ctx *ctx = pctx; char **arg; int r; - ctx->db = db; + ctx->ac = ac; foreach_array_item(arg, args) { ctx->xfrm.is = apk_istream_from_file(AT_FDCWD, *arg); ctx->xfrm.os = apk_ostream_to_file(AT_FDCWD, *arg, 0644); @@ -84,7 +85,6 @@ static int adbsign_main(void *pctx, struct apk_database *db, struct apk_string_a static struct apk_applet apk_adbsign = { .name = "adbsign", - .open_flags = APK_OPENF_READ | APK_OPENF_NO_STATE | APK_OPENF_NO_REPOS, .context_size = sizeof(struct sign_ctx), .optgroups = { &optgroup_global, &optgroup_signing, &optgroup_applet }, .main = adbsign_main, |