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

extract: fix directory handling 

'is' is null for directories
cute-signatures
Timo Teräs 2021-08-17 13:53:01 +03:00
parent f446f2253d
commit a46043bcc4
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/app_extract.c
View File

@ -146,13 +146,14 @@ static int extract_file(struct apk_extract_ctx *ectx, const struct apk_file_info
apk_dbg2(out, "%s", fi->name);
if (fi->uvol_name) return apk_extract_volume(ectx->ac, fi, is);
r = apk_extract_file(ctx->root_fd, fi, 0, 0, is, 0, 0, 0,
ctx->extract_flags, &ectx->ac->out);
r = apk_istream_close_error(is, r);
if (r != 0) unlinkat(ctx->root_fd, fi->name, 0);
if (fi->uvol_name && is) {
r = apk_extract_volume(ectx->ac, fi, is);
} else {
r = apk_extract_file(ctx->root_fd, fi, 0, 0, is, 0, 0, 0,
ctx->extract_flags, &ectx->ac->out);
if (r != 0) unlinkat(ctx->root_fd, fi->name, 0);
}
if (is) r = apk_istream_close_error(is, r);
return r;
}