diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2021-11-01 15:59:15 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2021-11-03 15:37:10 +0200 |
| commit | 5c0c249b7823e8537b9e60108e565b9b9a0bff24 (patch) | |
| tree | 632be87d7466dabf09ff26985accba728660d1c9 /src/database.c | |
| parent | d8212658653ad7cb1e220635b6dbd92923a60520 (diff) | |
| download | apk-tools-5c0c249b7823e8537b9e60108e565b9b9a0bff24.tar.gz apk-tools-5c0c249b7823e8537b9e60108e565b9b9a0bff24.tar.bz2 apk-tools-5c0c249b7823e8537b9e60108e565b9b9a0bff24.tar.xz apk-tools-5c0c249b7823e8537b9e60108e565b9b9a0bff24.zip | |
extract: move uvol extraction code to extract
fix also the progress callback on uvol extraction
Diffstat (limited to 'src/database.c')
| -rw-r--r-- | src/database.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/database.c b/src/database.c index 3841464..d145425 100644 --- a/src/database.c +++ b/src/database.c @@ -2415,7 +2415,8 @@ static int apk_db_install_file(struct apk_extract_ctx *ectx, const struct apk_fi struct install_ctx *ctx = container_of(ectx, struct install_ctx, ectx); static const char dot1[] = "/./", dot2[] = "/../"; struct apk_database *db = ctx->db; - struct apk_out *out = &db->ctx->out; + struct apk_ctx *ac = db->ctx; + struct apk_out *out = &ac->out; struct apk_package *pkg = ctx->pkg, *opkg; struct apk_dependency *dep; struct apk_installed_package *ipkg = pkg->ipkg; @@ -2566,7 +2567,7 @@ static int apk_db_install_file(struct apk_extract_ctx *ectx, const struct apk_fi db->root_fd, ae, format_tmpname(pkg, file, tmpname_file), format_tmpname(pkg, link_target_file, tmpname_link_target), - is, extract_cb, ctx, 0, db->extract_flags, out); + is, extract_cb, ctx, db->extract_flags, ac); switch (r) { case 0: |