root/ncdu-zig
1
0
Fork 0
mirror of https://code.blicky.net/yorhel/ncdu.git synced 2026-01-13 01:08:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP: improve compatibility with self-hosted compiler

Browse source 
Signed-off-by: Eric Joldasov <bratishkaerik@getgoogleoff.me>
This commit is contained in:
Eric Joldasov 2022-08-22 03:18:06 +06:00
parent 2141143387
commit ed4399c584
No known key found for this signature in database
GPG key ID: 5C9C69060686B588
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.zig
View file

@ -8,7 +8,6 @@ pub fn build(b: *std.build.Builder) void {
const mode = b.standardReleaseOptions(); const mode = b.standardReleaseOptions();
const exe = b.addExecutable("ncdu", "src/main.zig"); const exe = b.addExecutable("ncdu", "src/main.zig");
exe.use_stage1 = true; // TODO: remove
exe.setTarget(target); exe.setTarget(target);
exe.setBuildMode(mode); exe.setBuildMode(mode);
exe.addCSourceFile("src/ncurses_refs.c", &[_][]const u8{}); 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); run_step.dependOn(&run_cmd.step);
const tst = b.addTest("src/main.zig"); const tst = b.addTest("src/main.zig");
tst.use_stage1 = true; // TODO: remove
tst.linkLibC(); tst.linkLibC();
tst.linkSystemLibrary("ncursesw"); tst.linkSystemLibrary("ncursesw");
tst.addCSourceFile("src/ncurses_refs.c", &[_][]const u8{}); tst.addCSourceFile("src/ncurses_refs.c", &[_][]const u8{});

8
src/main.zig
View file

@ -261,7 +261,8 @@ fn tryReadArgsFile(path: [:0]const u8) void {
defer f.close(); defer f.close();
var arglist = std.ArrayList([:0]const u8).init(allocator); 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; var linebuf: [4096]u8 = undefined;
while ( while (
@ -379,7 +380,8 @@ fn spawnShell() void {
fn readExcludeFile(path: [:0]const u8) !void { fn readExcludeFile(path: [:0]const u8) !void {
const f = try std.fs.cwd().openFileZ(path, .{}); const f = try std.fs.cwd().openFileZ(path, .{});
defer f.close(); 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); var buf = std.ArrayList(u8).init(allocator);
defer buf.deinit(); defer buf.deinit();
while (true) { while (true) {
@ -395,7 +397,7 @@ pub fn main() void {
_ = c.setlocale(c.LC_ALL, ""); _ = c.setlocale(c.LC_ALL, "");
if (c.localeconv()) |locale| { if (c.localeconv()) |locale| {
if (locale.*.thousands_sep) |sep| { 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) if (span.len > 0)
config.thousands_sep = span; config.thousands_sep = span;
} }