diff --git a/build.zig b/build.zig index 594a7ed..7c67444 100644 --- a/build.zig +++ b/build.zig @@ -8,7 +8,6 @@ pub fn build(b: *std.build.Builder) void { const mode = b.standardReleaseOptions(); const exe = b.addExecutable("ncdu", "src/main.zig"); - exe.use_stage1 = true; // TODO: remove exe.setTarget(target); exe.setBuildMode(mode); exe.addCSourceFile("src/ncurses_refs.c", &[_][]const u8{}); @@ -26,7 +25,6 @@ pub fn build(b: *std.build.Builder) void { run_step.dependOn(&run_cmd.step); const tst = b.addTest("src/main.zig"); - tst.use_stage1 = true; // TODO: remove tst.linkLibC(); tst.linkSystemLibrary("ncursesw"); tst.addCSourceFile("src/ncurses_refs.c", &[_][]const u8{}); diff --git a/src/main.zig b/src/main.zig index 42fbc1f..83a1083 100644 --- a/src/main.zig +++ b/src/main.zig @@ -261,7 +261,8 @@ fn tryReadArgsFile(path: [:0]const u8) void { defer f.close(); var arglist = std.ArrayList([:0]const u8).init(allocator); - var rd = std.io.bufferedReader(f.reader()).reader(); + var buffered_reader = std.io.bufferedReader(f.reader()); + const rd = buffered_reader.reader(); var linebuf: [4096]u8 = undefined; while ( @@ -379,7 +380,8 @@ fn spawnShell() void { fn readExcludeFile(path: [:0]const u8) !void { const f = try std.fs.cwd().openFileZ(path, .{}); defer f.close(); - var rd = std.io.bufferedReader(f.reader()).reader(); + var buffered_reader = std.io.bufferedReader(f.reader()); + const rd = buffered_reader.reader(); var buf = std.ArrayList(u8).init(allocator); defer buf.deinit(); while (true) { @@ -395,7 +397,7 @@ pub fn main() void { _ = c.setlocale(c.LC_ALL, ""); if (c.localeconv()) |locale| { if (locale.*.thousands_sep) |sep| { - const span = std.mem.sliceTo(sep, 0); + const span = std.mem.sliceTo(@ptrCast([*c]u8, sep), 0); //TODO: bug in translate-c? if (span.len > 0) config.thousands_sep = span; }