zig

commit e0a38f7f3e2b3dc272cd9ab4f826315590664779 (tree)
parent 6bbb168f6667520dc106bc93c6e3761d5611fccb
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Thu, 20 Aug 2020 23:53:34 -0700

stage2: make the cache dir if it doesn't already exist

Diffstat:
M
src-self-hosted/introspect.zig
 | 
13
++++++++-----

1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src-self-hosted/introspect.zig b/src-self-hosted/introspect.zig
@@ -87,6 +87,13 @@ pub fn resolveGlobalCacheDir(allocator: *mem.Allocator) ![]u8 {
     return fs.getAppDataDir(allocator, appname);
 }
 
+pub fn openGlobalCacheDir() !fs.Dir {
+    var buf: [fs.MAX_PATH_BYTES]u8 = undefined;
+    var fba = std.heap.FixedBufferAllocator.init(&buf);
+    const path_name = try resolveGlobalCacheDir(&fba.allocator);
+    return fs.cwd().makeOpenPath(path_name, .{});
+}
+
 var compiler_id_mutex = std.Mutex{};
 var compiler_id: [16]u8 = undefined;
 var compiler_id_computed = false;
@@ -99,11 +106,7 @@ pub fn resolveCompilerId(gpa: *mem.Allocator) ![16]u8 {
         return compiler_id;
     compiler_id_computed = true;
 
-    const global_cache_dir = try resolveGlobalCacheDir(gpa);
-    defer gpa.free(global_cache_dir);
-
-    // TODO Introduce openGlobalCacheDir which returns a dir handle rather than a string.
-    var cache_dir = try fs.cwd().openDir(global_cache_dir, .{});
+    var cache_dir = try openGlobalCacheDir();
     defer cache_dir.close();
 
     var ch = try CacheHash.init(gpa, cache_dir, "exe");