diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2021-12-02 18:04:43 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2021-12-02 18:04:43 +0200 |
| commit | 4dde7e7e0fc79708119644b14b7123213d0de10d (patch) | |
| tree | 1cec603092ffce954bb43bd7d37aa09c9280931f | |
| parent | 845fa9381441cf9e266ae7f220ef9f2c6c4c77dc (diff) | |
| download | apk-tools-4dde7e7e0fc79708119644b14b7123213d0de10d.tar.gz apk-tools-4dde7e7e0fc79708119644b14b7123213d0de10d.tar.bz2 apk-tools-4dde7e7e0fc79708119644b14b7123213d0de10d.tar.xz apk-tools-4dde7e7e0fc79708119644b14b7123213d0de10d.zip | |
extract: fix uvol to not be called for uvol directory
| -rw-r--r-- | src/fs_fsys.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/fs_fsys.c b/src/fs_fsys.c index 3518f79..3dad4e0 100644 --- a/src/fs_fsys.c +++ b/src/fs_fsys.c @@ -306,8 +306,14 @@ static const struct apk_fsdir_ops *apk_fsops_get(apk_blob_t dir) int apk_fs_extract(struct apk_ctx *ac, const struct apk_file_info *fi, struct apk_istream *is, apk_progress_cb cb, void *cb_ctx, unsigned int extract_flags, apk_blob_t pkgctx) { - const struct apk_fsdir_ops *ops = apk_fsops_get(APK_BLOB_PTR_LEN((char*)fi->name, strnlen(fi->name, 5))); - return ops->file_extract(ac, fi, is, cb, cb_ctx, extract_flags, pkgctx); + if (S_ISDIR(fi->mode)) { + struct apk_fsdir fsd; + apk_fsdir_get(&fsd, APK_BLOB_STR((char*)fi->name), ac, pkgctx); + return apk_fsdir_create(&fsd, fi->mode); + } else { + const struct apk_fsdir_ops *ops = apk_fsops_get(APK_BLOB_PTR_LEN((char*)fi->name, strnlen(fi->name, 5))); + return ops->file_extract(ac, fi, is, cb, cb_ctx, extract_flags, pkgctx); + } } void apk_fsdir_get(struct apk_fsdir *d, apk_blob_t dir, struct apk_ctx *ac, apk_blob_t pkgctx) |