Switch to zlib-ng
This commit is contained in:
@@ -21,7 +21,7 @@ pub fn build(b: *std.Build) !void {
|
|||||||
});
|
});
|
||||||
mod.addOptions("config", zig_squashfs_options);
|
mod.addOptions("config", zig_squashfs_options);
|
||||||
if (use_c_libs_option == true) {
|
if (use_c_libs_option == true) {
|
||||||
mod.linkSystemLibrary("zlib", .{ .preferred_link_mode = .static });
|
mod.linkSystemLibrary("zlib-ng", .{ .preferred_link_mode = .static });
|
||||||
mod.linkSystemLibrary("lzma", .{ .preferred_link_mode = .static });
|
mod.linkSystemLibrary("lzma", .{ .preferred_link_mode = .static });
|
||||||
if (allow_lzo == true)
|
if (allow_lzo == true)
|
||||||
mod.linkSystemLibrary("minilzo", .{ .preferred_link_mode = .static });
|
mod.linkSystemLibrary("minilzo", .{ .preferred_link_mode = .static });
|
||||||
|
|||||||
+3
-2
@@ -11,7 +11,7 @@ const config = if (builtin.is_test) .{
|
|||||||
} else @import("config");
|
} else @import("config");
|
||||||
|
|
||||||
const c = @cImport({
|
const c = @cImport({
|
||||||
@cInclude("zlib.h");
|
@cInclude("zlib-ng.h");
|
||||||
@cInclude("lzma.h");
|
@cInclude("lzma.h");
|
||||||
@cInclude("lz4.h");
|
@cInclude("lz4.h");
|
||||||
@cInclude("zstd.h");
|
@cInclude("zstd.h");
|
||||||
@@ -43,7 +43,7 @@ fn zigGzip(alloc: std.mem.Allocator, in: []u8, out: []u8) anyerror!usize {
|
|||||||
fn cGzip(alloc: std.mem.Allocator, in: []u8, out: []u8) anyerror!usize {
|
fn cGzip(alloc: std.mem.Allocator, in: []u8, out: []u8) anyerror!usize {
|
||||||
_ = alloc;
|
_ = alloc;
|
||||||
var out_len: usize = out.len;
|
var out_len: usize = out.len;
|
||||||
const res = c.uncompress(out.ptr, &out_len, in.ptr, in.len);
|
const res = c.zng_uncompress2(out.ptr, &out_len, in.ptr, in.len);
|
||||||
return switch (res) {
|
return switch (res) {
|
||||||
c.Z_OK => out_len,
|
c.Z_OK => out_len,
|
||||||
c.Z_MEM_ERROR => error.NotEnoughMemory,
|
c.Z_MEM_ERROR => error.NotEnoughMemory,
|
||||||
@@ -137,6 +137,7 @@ fn cXz(alloc: std.mem.Allocator, in: []u8, out: []u8) anyerror!usize {
|
|||||||
.avail_in = in.len,
|
.avail_in = in.len,
|
||||||
.next_out = out.ptr,
|
.next_out = out.ptr,
|
||||||
.avail_out = out.len,
|
.avail_out = out.len,
|
||||||
|
// .allocator = _, TODO: create a custom allocator based on alloc,
|
||||||
};
|
};
|
||||||
var res = c.lzma_stream_decoder(&stream, in.len * 2, 0);
|
var res = c.lzma_stream_decoder(&stream, in.len * 2, 0);
|
||||||
switch (res) {
|
switch (res) {
|
||||||
|
|||||||
Reference in New Issue
Block a user