feat: sync with upstream to 2.8.2

Author: konosubakonoakua

ChangeLog

@@ -1,6 +1,16 @@
 # SPDX-FileCopyrightText: Yorhel <[email protected]>
 # SPDX-License-Identifier: MIT
 
+2.8.2 - 2025-05-01
+	- Still requires Zig 0.14
+	- Fix a build error on MacOS
+
+2.8.1 - 2025-04-28
+	- Still requires Zig 0.14
+	- Fix integer overflow in binary export
+	- Fix crash when `fstatat()` returns EINVAL
+	- Minor build system improvements
+
 2.8 - 2025-03-05
 	- Now requires Zig 0.14
 	- Add support for @-prefixed lines to ignore errors in config file

build.zig

@@ -7,27 +7,31 @@ pub fn build(b: *std.Build) void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
 
-    const pie = b.option(bool, "pie", "Build with PIE support (by default false)") orelse false;
+    const pie = b.option(bool, "pie", "Build with PIE support (by default: target-dependant)");
     const strip = b.option(bool, "strip", "Strip debugging info (by default false)") orelse false;
 
-    const exe = b.addExecutable(.{
-        .name = "ncdu",
+    const main_mod = b.createModule(.{
         .root_source_file = b.path("src/main.zig"),
         .target = target,
         .optimize = optimize,
         .strip = strip,
         .link_libc = true,
     });
+    main_mod.linkSystemLibrary("ncursesw", .{});
+    main_mod.linkSystemLibrary("zstd", .{});
 
+    const exe = b.addExecutable(.{
+        .name = "ncdu",
+        .root_module = main_mod,
+    });
     exe.pie = pie;
-    exe.root_module.linkSystemLibrary("ncursesw", .{});
-    exe.root_module.linkSystemLibrary("libzstd", .{});
     // https://github.com/ziglang/zig/blob/faccd79ca5debbe22fe168193b8de54393257604/build.zig#L745-L748
     if (target.result.os.tag.isDarwin()) {
         // useful for package maintainers
         exe.headerpad_max_install_names = true;
     }
     b.installArtifact(exe);
+    // exe.addLibraryPath(.{ .cwd_relative = "/lib/x86_64-linux-gnu" });
 
     const run_cmd = b.addRunArtifact(exe);
     run_cmd.step.dependOn(b.getInstallStep());
@@ -39,14 +43,9 @@ pub fn build(b: *std.Build) void {
     run_step.dependOn(&run_cmd.step);
 
     const unit_tests = b.addTest(.{
-        .root_source_file = b.path("src/main.zig"),
-        .target = target,
-        .optimize = optimize,
-        .link_libc = true,
+        .root_module = main_mod,
     });
     unit_tests.pie = pie;
-    unit_tests.root_module.linkSystemLibrary("ncursesw", .{});
-    unit_tests.root_module.linkSystemLibrary("libzstd", .{});
 
     const run_unit_tests = b.addRunArtifact(unit_tests);
 

ncdu.1

@@ -1,6 +1,6 @@
 .\" SPDX-FileCopyrightText: Yorhel <[email protected]>
 .\" SPDX-License-Identifier: MIT
-.Dd November 19, 2024
+.Dd May 1, 2025
 .Dt NCDU 1
 .Os
 .Sh NAME
@@ -286,7 +286,7 @@ when given twice it will also add
 thus ensuring that there is no way to modify the file system from within
 .Nm .
 .It Fl \-si , \-no\-si
-List sizes using base 10 prefixes, that is, powers of 1000 (KB, MB, etc), as
+List sizes using base 10 prefixes, that is, powers of 1000 (kB, MB, etc), as
 defined in the International System of Units (SI), instead of the usual base 2
 prefixes (KiB, MiB, etc).
 .It Fl \-disk\-usage , \-apparent\-size
@@ -392,6 +392,7 @@ is given on the command line.
 .Pp
 The configuration file format is simply one command line option per line.
 Lines starting with '#' are ignored.
+A line can be prefixed with '@' to suppress errors while parsing the option.
 Example configuration file:
 .Bd -literal -offset indent
 # Always enable extended mode
@@ -402,6 +403,9 @@ Example configuration file:
 
 # Exclude .git directories
 \-\-exclude .git
+
+# Read excludes from ~/.ncduexcludes, ignore error if the file does not exist
+@--exclude-from ~/.ncduexcludes
 .Ed
 .
 .Sh KEYS

src/bin_export.zig

@@ -17,8 +17,6 @@ pub const global = struct {
     var root_itemref: u64 = 0;
 };
 
-const BLOCK_SIZE: usize = 64*1024;
-
 pub const SIGNATURE = "\xbfncduEX1";
 
 pub const ItemKey = enum(u5) {
@@ -81,10 +79,15 @@ fn blockSize(num: u32) usize {
       else                     2048<<10; // 32768
 }
 
+// Upper bound on the return value of blockSize()
+// (config.export_block_size may be larger than the sizes listed above, let's
+// stick with the maximum block size supported by the file format to be safe)
+const MAX_BLOCK_SIZE: usize = 1<<28;
+
 
 pub const Thread = struct {
     buf: []u8 = undefined,
-    off: usize = std.math.maxInt(usize) - (1<<10), // large number to trigger a flush() for the first write
+    off: usize = MAX_BLOCK_SIZE, // pretend we have a full block to trigger a flush() for the first write
     block_num: u32 = std.math.maxInt(u32),
     itemref: u64 = 0, // ref of item currently being written
 
@@ -124,7 +127,7 @@ pub const Thread = struct {
 
         global.lock.lock();
         defer global.lock.unlock();
-        // This can only really happen when the root path exceeds BLOCK_SIZE,
+        // This can only really happen when the root path exceeds our block size,
         // in which case we would probably have error'ed out earlier anyway.
         if (expected_len > t.buf.len) ui.die("Error writing data: path too long.\n", .{});
 
@@ -430,7 +433,7 @@ pub const Dir = struct {
 
 pub fn createRoot(stat: *const sink.Stat, threads: []sink.Thread) Dir {
     for (threads) |*t| {
-        t.sink.bin.buf = main.allocator.alloc(u8, BLOCK_SIZE) catch unreachable;
+        t.sink.bin.buf = main.allocator.alloc(u8, blockSize(0)) catch unreachable;
     }
 
     return .{ .stat = stat.* };

src/main.zig

@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Yorhel <[email protected]>
 // SPDX-License-Identifier: MIT
 
-pub const program_version = "2.8";
+pub const program_version = "2.8.2";
 
 const std = @import("std");
 const model = @import("model.zig");

src/scan.zig

@@ -47,13 +47,23 @@ fn truncate(comptime T: type, comptime field: anytype, x: anytype) std.meta.fiel
 
 
 fn statAt(parent: std.fs.Dir, name: [:0]const u8, follow: bool, symlink: *bool) !sink.Stat {
-    const stat = try std.posix.fstatatZ(parent.fd, name, if (follow) 0 else std.posix.AT.SYMLINK_NOFOLLOW);
-    symlink.* = std.posix.S.ISLNK(stat.mode);
+    // std.posix.fstatatZ() in Zig 0.14 is not suitable due to https://github.com/ziglang/zig/issues/23463
+    var stat: std.c.Stat = undefined;
+    if (std.c.fstatat(parent.fd, name, &stat, if (follow) 0 else std.c.AT.SYMLINK_NOFOLLOW) != 0) {
+        return switch (std.c._errno().*) {
+            @intFromEnum(std.c.E.NOENT) => error.FileNotFound,
+            @intFromEnum(std.c.E.NAMETOOLONG) => error.NameTooLong,
+            @intFromEnum(std.c.E.NOMEM) => error.OutOfMemory,
+            @intFromEnum(std.c.E.ACCES) => error.AccessDenied,
+            else => error.Unexpected,
+        };
+    }
+    symlink.* = std.c.S.ISLNK(stat.mode);
     return sink.Stat{
         .etype =
-            if (std.posix.S.ISDIR(stat.mode)) .dir
+            if (std.c.S.ISDIR(stat.mode)) .dir
             else if (stat.nlink > 1) .link
-            else if (!std.posix.S.ISREG(stat.mode)) .nonreg
+            else if (!std.c.S.ISREG(stat.mode)) .nonreg
             else .reg,
         .blocks = clamp(sink.Stat, .blocks, stat.blocks),
         .size = clamp(sink.Stat, .size, stat.size),