Update to Zig 0.13.0

Author: Felix "xq" Queißner

.github/workflows/build.yml

@@ -22,19 +22,6 @@ jobs:
         run: |
           zig build
 
-      - name: Exercise Build options
+      - name: Compile and run demo
         run: |
-          zig build -Dstatic-rtc=1980-01-01
-          zig build -Dstatic-rtc=2107-01-01
-          zig build -Dsector-size=512
-          zig build -Dsector-size=1024
-          zig build -Dsector-size=2048
-          zig build -Dsector-size=4096
-          zig build -Dsector-size=512:4096
-          zig build -Dsector-size=1024:4096
-          zig build -Dsector-size=2048:4096
-          zig build -Dvolume-count=1
-          zig build -Dvolume-count=2
-          zig build -Dvolume-count=10
-          zig build -Dvolume-names=C
-          zig build -Dvolume-names=C,D,E,F
+          zig build install debug

.github/workflows/validate.yml

@@ -119,6 +119,7 @@ pub fn build(b: *std.Build) void {
         // .max_long_name_len = 121,
         .code_page = .us,
         .@"volume-count" = @as(u32, 1),
+        .@"sector-size" = @as(u32, 512),
         // .rtc = .dynamic,
         .mkfs = true,
         .exfat = true,
@@ -130,7 +131,7 @@ pub fn build(b: *std.Build) void {
         .name = "mkfs.fat",
         .target = b.host,
         .optimize = .ReleaseSafe,
-        .root_source_file = .{ .cwd_relative = build_root ++ "/src/mkfs.fat.zig" },
+        .root_source_file = b.path("src/mkfs.fat.zig"),
     });
     mkfs_fat.root_module.addImport("fat", zfat_mod);
     mkfs_fat.linkLibC();
@@ -305,8 +306,13 @@ pub const InitializeDiskStep = struct {
 
     const HumanContext = std.BoundedArray(u8, 256);
 
-    fn writeDiskImage(b: *std.Build, asking: *std.Build.Step, disk: std.fs.File, base: u64, length: u64, content: Content, context: *HumanContext) !void {
-        try disk.seekTo(base);
+    const DiskImage = struct {
+        path: []const u8,
+        handle: *std.fs.File,
+    };
+
+    fn writeDiskImage(b: *std.Build, asking: *std.Build.Step, disk: DiskImage, base: u64, length: u64, content: Content, context: *HumanContext) !void {
+        try disk.handle.seekTo(base);
 
         const context_len = context.len;
         defer context.len = context_len;
@@ -396,7 +402,7 @@ pub const InitializeDiskStep = struct {
                     boot_sector[0x01FE] = 0x55;
                     boot_sector[0x01FF] = 0xAA;
 
-                    try disk.writeAll(&boot_sector);
+                    try disk.handle.writeAll(&boot_sector);
                 }
 
                 {
@@ -426,23 +432,23 @@ pub const InitializeDiskStep = struct {
             .fs => |fs| {
                 const maker_exe = fs.executable.?.getPath2(b, asking);
 
-                try disk.sync();
+                try disk.handle.sync();
 
-                const disk_image_path = switch (builtin.os.tag) {
-                    .linux => blk: {
-                        const self_pid = std.os.linux.getpid();
-                        break :blk b.fmt("/proc/{}/fd/{}", .{ self_pid, disk.handle });
-                    },
+                // const disk_image_path = switch (builtin.os.tag) {
+                //     .linux => blk: {
+                //         const self_pid = std.os.linux.getpid();
+                //         break :blk b.fmt("/proc/{}/fd/{}", .{ self_pid, disk.handle });
+                //     },
 
-                    else => @compileError("TODO: Support this on other OS as well!"),
-                };
+                //     else => @compileError("TODO: Support this on other OS as well!"),
+                // };
 
                 var argv = std.ArrayList([]const u8).init(b.allocator);
                 defer argv.deinit();
 
                 try argv.appendSlice(&.{
                     maker_exe, // exe
-                    disk_image_path, // image file
+                    disk.path, // image file
                     b.fmt("0x{X:0>8}", .{base}), // filesystem offset (bytes)
                     b.fmt("0x{X:0>8}", .{length}), // filesystem length (bytes)
                     @tagName(fs.format), // filesystem type
@@ -473,7 +479,7 @@ pub const InitializeDiskStep = struct {
                 // use shared access to the file:
                 const stdout = b.run(argv.items);
 
-                try disk.sync();
+                try disk.handle.sync();
 
                 _ = stdout;
             },
@@ -490,7 +496,7 @@ pub const InitializeDiskStep = struct {
         }
     }
 
-    fn copyFileToImage(disk: std.fs.File, max_length: u64, dir: std.fs.Dir, path: []const u8, context: []const u8) !void {
+    fn copyFileToImage(disk: DiskImage, max_length: u64, dir: std.fs.Dir, path: []const u8, context: []const u8) !void {
         errdefer std.log.err("{s}: failed to copy data to image.", .{context});
 
         var file = try dir.openFile(path, .{});
@@ -510,11 +516,11 @@ pub const InitializeDiskStep = struct {
 
         var pumper = IoPump.init();
 
-        try pumper.pump(file.reader(), disk.writer());
+        try pumper.pump(file.reader(), disk.handle.writer());
 
         const padding = max_length - stat.size;
         if (padding > 0) {
-            try disk.writer().writeByteNTimes(' ', padding);
+            try disk.handle.writer().writeByteNTimes(' ', padding);
         }
     }
 
@@ -549,7 +555,9 @@ pub const InitializeDiskStep = struct {
             return;
 
         {
-            var disk = try std.fs.cwd().createFile(ids.disk_file.path.?, .{});
+            const disk_path = ids.disk_file.path.?;
+
+            var disk = try std.fs.cwd().createFile(disk_path, .{});
             defer disk.close();
 
             try disk.seekTo(ids.size - 1);
@@ -559,7 +567,12 @@ pub const InitializeDiskStep = struct {
             var context = HumanContext{};
             context.appendSliceAssumeCapacity("disk");
 
-            try writeDiskImage(b, step, disk, 0, ids.size, ids.content, &context);
+            const disk_image = DiskImage{
+                .path = disk_path,
+                .handle = &disk,
+            };
+
+            try writeDiskImage(b, step, disk_image, 0, ids.size, ids.content, &context);
         }
 
         // if (!step.result_cached)

build.zig

@@ -3,8 +3,8 @@
     .version = "0.1.0",
     .dependencies = .{
         .zfat = .{
-            .url = "https://github.com/ZigEmbeddedGroup/zfat/archive/34f1c70afe1b04d9b378c373922fe01de342ddcf.tar.gz",
-            .hash = "1220321b9050e25e4e6d94cb8564009e5f913cf39f26f2c0b358f971175bb1c299b2",
+            .url = "https://github.com/ZigEmbeddedGroup/zfat/archive/68dbbe19258b174fe4f374a91b4cc939019d9fe7.tar.gz",
+            .hash = "1220963601b9bc8dacc422d098368567e5c7b84d21f9ae73067fe3eb9c566aea02fd",
         },
     },
     .paths = .{

build.zig.zon

@@ -48,7 +48,7 @@ pub fn format() !void {
 }
 
 pub fn mount() !void {
-    try fatfs.FileSystem.mount(&filesystem, "0:", true);
+    try filesystem.mount("0:", true);
 }
 
 pub fn mkdir(path: []const u8) !void {
@@ -95,11 +95,9 @@ fn disk_initialize(intf: *fatfs.Disk) fatfs.Disk.Error!fatfs.Disk.Status {
 fn disk_read(intf: *fatfs.Disk, buff: [*]u8, sector: fatfs.LBA, count: c_uint) fatfs.Disk.Error!void {
     _ = intf;
 
-    const block_ptr = @as([*][512]u8, @ptrCast(buff));
-
-    var i: usize = 0;
-    while (i < count) : (i += 1) {
-        block_ptr[i] = App.device.read(sector + i) catch return error.IoError;
+    const blocks = std.mem.bytesAsSlice(shared.Block, buff[0 .. count * shared.BlockDevice.block_size]);
+    for (blocks, 0..) |*block, i| {
+        block.* = App.device.read(sector + i) catch return error.IoError;
     }
 }
 

src/mkfs.fat.zig

@@ -46,7 +46,9 @@ pub fn App(comptime Context: type) type {
             if (command_list.len == 0)
                 return mistake("no commands.", .{});
 
-            var image_file = try std.fs.cwd().openFile(image_file_path, .{ .mode = .read_write });
+            var image_file = try std.fs.cwd().openFile(image_file_path, .{
+                .mode = .read_write,
+            });
             defer image_file.close();
 
             const stat = try image_file.stat();
@@ -200,7 +202,7 @@ const Command = enum {
     dir,
 };
 
-pub const Block = [512]u8;
+pub const Block = [BlockDevice.block_size]u8;
 
 pub const BlockDevice = struct {
     pub const block_size = 512;