Clean up

Author: mpfaff

src/bootstrap.zig

@@ -25,7 +25,7 @@ fn mono_doorstop_bootstrap(mono_domain: *mono.Domain) void {
 
     mono.addrs.thread_set_main.?(mono.addrs.thread_current.?());
 
-    var program_path_buf = util.paths.ProgramPathBuf{};
+    var program_path_buf: util.paths.ProgramPathBuf = undefined;
     const app_path = program_path_buf.get();
     util.setEnv("DOORSTOP_PROCESS_PATH", app_path);
 
@@ -192,7 +192,7 @@ fn il2cpp_doorstop_bootstrap() void {
 
     coreclr.load(coreclr_module);
 
-    var program_path_buf = util.paths.ProgramPathBuf{};
+    var program_path_buf: util.paths.ProgramPathBuf = undefined;
     const app_path = program_path_buf.get();
 
     const target_dir = util.paths.getFolderName(os_char, config.target_assembly.?);

src/debug/env.zig

@@ -0,0 +1,32 @@
+const builtin = @import("builtin");
+const std = @import("std");
+
+const root = @import("../root.zig");
+const alloc = root.alloc;
+const logger = root.logger;
+const util = root.util;
+
+pub fn dumpProgramPath() void {
+    var program_path_buf: util.paths.ProgramPathBuf = undefined;
+    const app_path = program_path_buf.get();
+    const app_dir = util.paths.getFolderName(util.os_char, app_path);
+    logger.debug("Executable path: {}", .{util.fmtString(app_path)});
+    logger.debug("Application dir: {}", .{util.fmtString(app_dir)});
+}
+
+pub fn dumpWorkingDir() void {
+    const working_dir = util.paths.getWorkingDir() catch |e| std.debug.panic("Failed to determine current working directory path: {}", .{e});
+    defer alloc.free(working_dir);
+    logger.debug("Working dir: {}", .{util.fmtString(working_dir)});
+}
+
+pub fn dumpDoorstopPath(module: if (builtin.os.tag == .windows) std.os.windows.HMODULE else void) void {
+    var doorstop_path_buf: util.paths.ModulePathBuf = undefined;
+    const doorstop_path = doorstop_path_buf.get(switch (builtin.os.tag) {
+        .windows => module,
+        // on *nix we just need an address in the library
+        else => &dumpDoorstopPath,
+    }).?;
+
+    logger.debug("Doorstop library path: {}", .{util.fmtString(doorstop_path)});
+}

src/entrypoint.zig

@@ -35,28 +35,10 @@ pub fn entrypoint(module: if (builtin.os.tag == .windows) std.os.windows.HMODULE
 
     logger.debug("Doorstop started!", .{});
 
-    {
-        var program_path_buf = util.paths.ProgramPathBuf{};
-        const app_path = program_path_buf.get();
-        const app_dir = util.paths.getFolderName(util.os_char, app_path);
-        logger.debug("Executable path: {}", .{util.fmtString(app_path)});
-        logger.debug("Application dir: {}", .{util.fmtString(app_dir)});
-    }
-
-    {
-        const working_dir = util.paths.getWorkingDir() catch |e| std.debug.panic("Failed to determine current working directory path: {}", .{e});
-        defer alloc.free(working_dir);
-        logger.debug("Working dir: {}", .{util.fmtString(working_dir)});
-    }
-
-    var doorstop_path_buf = util.paths.ModulePathBuf{};
-    const doorstop_path = doorstop_path_buf.get(switch (builtin.os.tag) {
-        .windows => module,
-        // on *nix we just need an address in the library
-        else => &entrypoint,
-    }).?;
-
-    logger.debug("Doorstop library path: {}", .{util.fmtString(doorstop_path)});
+    const debug_env = @import("debug/env.zig");
+    debug_env.dumpProgramPath();
+    debug_env.dumpWorkingDir();
+    debug_env.dumpDoorstopPath(module);
 
     switch (builtin.os.tag) {
         // windows

src/hooks.zig

@@ -21,7 +21,7 @@ fn hookBootConfigCommon() ?[*:0]const os_char {
 
     const path = switch (builtin.os.tag) {
         .macos => blk: {
-            var program_path_buf = util.paths.ProgramPathBuf{};
+            var program_path_buf: util.paths.ProgramPathBuf = undefined;
             const program_path = program_path_buf.get();
             const app_folder = util.paths.getFolderName(u8, util.paths.getFolderName(u8, program_path));
 
@@ -32,7 +32,7 @@ fn hookBootConfigCommon() ?[*:0]const os_char {
             ) catch @panic("Out of memory");
         },
         else => blk: {
-            var program_path_buf = util.paths.ProgramPathBuf{};
+            var program_path_buf: util.paths.ProgramPathBuf = undefined;
             const program_path = program_path_buf.get();
             const file_name = util.paths.getFileName(os_char, program_path, false);
 
@@ -185,7 +185,7 @@ fn redirectInit(
                 // However, using handle seems to cause issues on some distros, so we pass
                 // the resolved symbol instead.
                 // TODO: document specific cases
-                var buf = util.paths.ModulePathBuf{};
+                var buf: util.paths.ModulePathBuf = undefined;
                 const path = buf.get(switch (builtin.os.tag) {
                     .windows => handle,
                     else => std.c.dlsym(handle, name),

src/util/paths.zig

@@ -31,7 +31,7 @@ pub fn folder_exists(file: [*:0]const os_char) bool {
 }
 
 pub const ModulePathBuf = struct {
-    buf: if (builtin.os.tag == .windows) [std.os.windows.PATH_MAX_WIDE]u16 else void = undefined,
+    buf: if (builtin.os.tag == .windows) [std.os.windows.PATH_MAX_WIDE]u16 else void,
 
     pub fn get(self: *@This(), module: ?util.Module(true)) ?[:0]const os_char {
         self.* = undefined;
@@ -109,7 +109,7 @@ pub fn getWorkingDir() ![:0]os_char {
 }
 
 pub const ProgramPathBuf = struct {
-    buf: if (builtin.os.tag == .windows) ModulePathBuf else [std.fs.max_path_bytes:0]u8 = undefined,
+    buf: if (builtin.os.tag == .windows) ModulePathBuf else [std.fs.max_path_bytes:0]u8,
 
     pub fn get(self: *@This()) [:0]const os_char {
         if (builtin.os.tag == .windows) {