general fixes & windows compat

Author: Khitiara

build.zig

@@ -129,7 +129,7 @@ pub fn build(b: *std.Build) void {
 
     const mkfs_fat = b.addExecutable(.{
         .name = "mkfs.fat",
-        .target = b.host,
+        .target = b.resolveTargetQuery(.{}),
         .optimize = .ReleaseSafe,
         .root_source_file = b.path("src/mkfs.fat.zig"),
     });
@@ -416,7 +416,7 @@ pub const InitializeDiskStep = struct {
                         var buffer: [64]u8 = undefined;
                         context.appendSliceAssumeCapacity(std.fmt.bufPrint(&buffer, "[{}]", .{part_id}) catch unreachable);
 
-                        try writeDiskImage(b, asking, disk, base + auto_offset, part.size, part.data, context);
+                        try writeDiskImage(b, asking, disk, part.offset orelse base + auto_offset, part.size, part.data, context);
 
                         auto_offset += part.size;
                     }
@@ -459,16 +459,16 @@ pub const InitializeDiskStep = struct {
                 for (fs.items) |item| {
                     switch (item) {
                         .empty_dir => |dir| {
-                            try argv.append(b.fmt("mkdir:{s}", .{dir}));
+                            try argv.append(b.fmt("mkdir;{s}", .{dir}));
                         },
                         .copy_dir => |src_dst| {
-                            try argv.append(b.fmt("dir:{s}:{s}", .{
+                            try argv.append(b.fmt("dir;{s};{s}", .{
                                 src_dst.source.getPath2(b, asking),
                                 src_dst.destination,
                             }));
                         },
                         .copy_file => |src_dst| {
-                            try argv.append(b.fmt("file:{s}:{s}", .{
+                            try argv.append(b.fmt("file;{s};{s}", .{
                                 src_dst.source.getPath2(b, asking),
                                 src_dst.destination,
                             }));
@@ -524,9 +524,8 @@ pub const InitializeDiskStep = struct {
         }
     }
 
-    fn make(step: *std.Build.Step, progress: std.Progress.Node) !void {
+    fn make(step: *std.Build.Step, _: std.Build.Step.MakeOptions) !void {
         const b = step.owner;
-        _ = progress;
 
         const ids: *InitializeDiskStep = @fieldParentPtr("step", step);
 
@@ -629,11 +628,10 @@ pub const Content = union(enum) {
                             dir.* = try allocator.dupe(u8, dir.*);
                         },
                         .copy_dir, .copy_file => |*cp| {
-                            const cp_new = .{
+                            cp.* = .{
                                 .destination = try allocator.dupe(u8, cp.destination),
                                 .source = cp.source.dupe(b),
                             };
-                            cp.* = cp_new;
                         },
                     }
                 }
@@ -734,6 +732,8 @@ pub const mbr = struct {
         empty = 0x00,
 
         fat12 = 0x01,
+        fat16_small = 0x04,
+        fat16 = 0x06,
         ntfs = 0x07,
 
         fat32_chs = 0x0B,

build.zig.zon

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

src/shared.zig

@@ -70,7 +70,7 @@ pub fn App(comptime Context: type) type {
             try Context.init(file_system);
 
             for (command_list) |command_sequence| {
-                var cmd_iter = std.mem.split(u8, command_sequence, ":");
+                var cmd_iter = std.mem.splitScalar(u8, command_sequence, ';');
 
                 const command_str = cmd_iter.next() orelse return mistake("bad command", .{});
 
@@ -96,7 +96,13 @@ pub fn App(comptime Context: type) type {
 
                         // std.log.info("file(\"{}\", \"{}\")", .{ std.zig.fmtEscapes(src), std.zig.fmtEscapes(dst) });
 
-                        var file = try std.fs.cwd().openFile(src, .{});
+                        var file = std.fs.cwd().openFile(src, .{}) catch |err| switch (err) {
+                            error.FileNotFound => {
+                                std.log.err("file not found: {s}", .{src});
+                                return err;
+                            },
+                            else => return err,
+                        };
                         defer file.close();
 
                         try addFile(file, dst);
@@ -174,7 +180,7 @@ pub fn App(comptime Context: type) type {
             var list = std.ArrayList([]const u8).init(allocator);
             defer list.deinit();
 
-            var parts = std.mem.tokenize(u8, src_path, "\\/");
+            var parts = std.mem.tokenizeAny(u8, src_path, "\\/");
 
             while (parts.next()) |part| {
                 if (std.mem.eql(u8, part, ".")) {