Generalize unxz

This commit is contained in:
topjohnwu
2023-09-21 05:47:21 -07:00
parent 15e13a8d8b
commit 46275b90c2
4 changed files with 24 additions and 23 deletions

View File

@@ -12,12 +12,13 @@
using namespace std;
bool unxz(int fd, const uint8_t *buf, size_t size) {
bool unxz(out_stream &strm, rust::Slice<const uint8_t> bytes) {
uint8_t out[8192];
xz_crc32_init();
size_t size = bytes.size();
struct xz_dec *dec = xz_dec_init(XZ_DYNALLOC, 1 << 26);
struct xz_buf b = {
.in = buf,
.in = bytes.data(),
.in_pos = 0,
.in_size = size,
.out = out,
@@ -29,20 +30,11 @@ bool unxz(int fd, const uint8_t *buf, size_t size) {
ret = xz_dec_run(dec, &b);
if (ret != XZ_OK && ret != XZ_STREAM_END)
return false;
write(fd, out, b.out_pos);
strm.write(out, b.out_pos);
b.out_pos = 0;
} while (b.in_pos != size);
return true;
}
static int dump_bin(const uint8_t *buf, size_t sz, const char *path, mode_t mode) {
int fd = xopen(path, O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, mode);
if (fd < 0)
return 1;
if (!unxz(fd, buf, sz))
return 1;
close(fd);
return 0;
}
void restore_ramdisk_init() {
@@ -59,10 +51,6 @@ void restore_ramdisk_init() {
}
}
int dump_preload(const char *path, mode_t mode) {
return dump_bin(init_ld_xz, sizeof(init_ld_xz), path, mode);
}
class RecoveryInit : public BaseInit {
public:
using BaseInit::BaseInit;