jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

extract: fix uvol to not be called for uvol directory

cute-signatures
Timo Teräs 2021-12-02 18:04:43 +02:00
parent 845fa93814
commit 4dde7e7e0f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fs_fsys.c
View File

@ -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, 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) apk_progress_cb cb, void *cb_ctx, unsigned int extract_flags, apk_blob_t 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))); 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); 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) void apk_fsdir_get(struct apk_fsdir *d, apk_blob_t dir, struct apk_ctx *ac, apk_blob_t pkgctx)