Commit 3d5a9237f7984a37f6aa086bd2b0783305f644e5 | zig

author	Igor Anić <igor.anic@gmail.com> 2024-04-04 19:45:35+02:00
committer	Igor Anić <igor.anic@gmail.com> 2024-04-09 15:00:22+02:00
log	3d5a9237f7984a37f6aa086bd2b0783305f644e5
tree	88b986ada709557757583374c563ce48ebe0fcce
parent	5f0b434f9031179609c97676bb43425f8710ac95

fetch: use empty string instead of null for root_dir

Make it consistent with Cache.Path sub_path.
Remove null check in many locations.

2 files changed, 19 insertions(+), 32 deletions(-)

lib
- std
  - tar.zig
src
- Package
  - Fetch.zig

lib/std/tar.zig+6-11

...	@@ -30,7 +30,7 @@ pub const Diagnostics = struct {	...	@@ -30,7 +30,7 @@ pub const Diagnostics = struct {
30	errors: std.ArrayListUnmanaged(Error) = .{},	30	errors: std.ArrayListUnmanaged(Error) = .{},
31		31
32	root_entries: usize = 0,	32	root_entries: usize = 0,
33	root_dir: ?[]const u8 = null,	33	root_dir: []const u8 = "",
34		34
35	pub const Error = union(enum) {	35	pub const Error = union(enum) {
36	unable_to_create_sym_link: struct {	36	unable_to_create_sym_link: struct {
...	@@ -55,10 +55,8 @@ pub const Diagnostics = struct {	...	@@ -55,10 +55,8 @@ pub const Diagnostics = struct {
55	d.root_dir = try d.allocator.dupe(u8, root_dir);	55	d.root_dir = try d.allocator.dupe(u8, root_dir);
56	return;	56	return;
57	}	57	}
58	if (d.root_dir) \|r\| {	58	d.allocator.free(d.root_dir);
59	d.allocator.free(r);	59	d.root_dir = "";
60	d.root_dir = null;
61	}
62	}	60	}
63	}	61	}
64		62
...	@@ -103,10 +101,7 @@ pub const Diagnostics = struct {	...	@@ -103,10 +101,7 @@ pub const Diagnostics = struct {
103	}	101	}
104	}	102	}
105	d.errors.deinit(d.allocator);	103	d.errors.deinit(d.allocator);
106	if (d.root_dir) \|r\| {	104	d.allocator.free(d.root_dir);
107	d.allocator.free(r);
108	d.root_dir = null;
109	}
110	d.* = undefined;	105	d.* = undefined;
111	}	106	}
112	};	107	};
...	@@ -1060,7 +1055,7 @@ test "pipeToFileSystem root_dir" {	...	@@ -1060,7 +1055,7 @@ test "pipeToFileSystem root_dir" {
1060	};	1055	};
1061		1056
1062	// there is no root_dir	1057	// there is no root_dir
1063	try testing.expect(diagnostics.root_dir == null);	1058	try testing.expectEqual(0, diagnostics.root_dir.len);
1064	try testing.expectEqual(3, diagnostics.root_entries);	1059	try testing.expectEqual(3, diagnostics.root_entries);
1065	}	1060	}
1066		1061
...	@@ -1082,7 +1077,7 @@ test "pipeToFileSystem root_dir" {	...	@@ -1082,7 +1077,7 @@ test "pipeToFileSystem root_dir" {
1082	};	1077	};
1083		1078
1084	// root_dir found	1079	// root_dir found
1085	try testing.expectEqualStrings("example", diagnostics.root_dir.?);	1080	try testing.expectEqualStrings("example", diagnostics.root_dir);
1086	try testing.expectEqual(1, diagnostics.root_entries);	1081	try testing.expectEqual(1, diagnostics.root_entries);
1087	}	1082	}
1088	}	1083	}

src/Package/Fetch.zig+13-21

 @@ -465,10 +465,7 @@ fn runResource(
         var unpack_result = try unpackResource(f, resource, uri_path, tmp_directory);
         defer unpack_result.deinit();
-        var pkg_path: Cache.Path = .{
+        var pkg_path: Cache.Path = .{ .root_dir = tmp_directory, .sub_path = unpack_result.root_dir };
-            .root_dir = tmp_directory,
-            .sub_path = if (unpack_result.root_dir) |root_dir| root_dir else "",
-        };
         // Apply btrfs workaround if needed. Reopen tmp_directory.
         if (native_os == .linux and f.job_queue.work_around_btrfs_bug) {
 @@ -503,8 +500,8 @@ fn runResource(
         // directory.
         f.actual_hash = try computeHash(f, pkg_path, filter);
-        break :blk if (unpack_result.root_dir) |root_dir|
+        break :blk if (unpack_result.root_dir.len > 0)
-            try fs.path.join(arena, &.{ tmp_dir_sub_path, root_dir })
+            try fs.path.join(arena, &.{ tmp_dir_sub_path, unpack_result.root_dir })
         else
             tmp_dir_sub_path;
     };
 @@ -1185,8 +1182,8 @@ fn unpackTarball(f: *Fetch, out_dir: fs.Dir, reader: anytype) RunError!UnpackRes
     ));
     var res = UnpackResult.init(gpa);
-    if (diagnostics.root_dir) |root_dir| {
+    if (diagnostics.root_dir.len > 0) {
-        res.root_dir = try gpa.dupe(u8, root_dir);
+        res.root_dir = try gpa.dupe(u8, diagnostics.root_dir);
     }
     if (diagnostics.errors.items.len > 0) {
         try res.rootErrorMessage("unable to unpack tarball");
 @@ -1748,9 +1745,9 @@ const UnpackResult = struct {
     errors: std.ArrayListUnmanaged(Error) = .{},
     root_error_message: []const u8 = "",
-    // A `null` value indicates the `tmp_directory` is populated directly with the package contents.
+    // A non empty value means that the package contents are inside a
-    // A non-null value means that the package contents are inside a sub-directory indicated by the named path.
+    // sub-directory indicated by the named path.
-    root_dir: ?[]const u8 = null,
+    root_dir: []const u8 = "",
     const Error = union(enum) {
         unable_to_create_sym_link: struct {
 @@ -1802,9 +1799,7 @@ const UnpackResult = struct {
         }
         self.errors.deinit(self.allocator);
         self.allocator.free(self.root_error_message);
-        if (self.root_dir) |root_dir| {
+        self.allocator.free(self.root_dir);
-            self.allocator.free(root_dir);
-        }
         self.* = undefined;
     }
 @@ -1837,11 +1832,10 @@ const UnpackResult = struct {
     // Filter errors by manifest inclusion rules.
     fn filterErrors(self: *UnpackResult, filter: Filter) !void {
         var i = self.errors.items.len;
-        const root_dir: []const u8 = if (self.root_dir) |root_dir| root_dir else "";
         while (i > 0) {
             i -= 1;
             const item = self.errors.items[i];
-            if (item.excluded(filter, root_dir)) {
+            if (item.excluded(filter, self.root_dir)) {
                 _ = self.errors.swapRemove(i);
                 item.free(self.allocator);
             }
 @@ -1861,8 +1855,6 @@ const UnpackResult = struct {
         if (self.errors.items.len == 0 and self.root_error_message.len == 0)
             return;
-        const root_dir = if (self.root_dir) |root_dir| root_dir else "";
         const notes_len: u32 = @intCast(self.errors.items.len);
         try eb.addRootErrorMessage(.{
             .msg = try eb.addString(self.root_error_message),
 @@ -1875,21 +1867,21 @@ const UnpackResult = struct {
                 .unable_to_create_sym_link => |info| {
                     eb.extra.items[note_i] = @intFromEnum(try eb.addErrorMessage(.{
                         .msg = try eb.printString("unable to create symlink from '{s}' to '{s}': {s}", .{
-                            stripRoot(info.file_name, root_dir), info.link_name, @errorName(info.code),
+                            stripRoot(info.file_name, self.root_dir), info.link_name, @errorName(info.code),
                         }),
                     }));
                 },
                 .unable_to_create_file => |info| {
                     eb.extra.items[note_i] = @intFromEnum(try eb.addErrorMessage(.{
                         .msg = try eb.printString("unable to create file '{s}': {s}", .{
-                            stripRoot(info.file_name, root_dir), @errorName(info.code),
+                            stripRoot(info.file_name, self.root_dir), @errorName(info.code),
                         }),
                     }));
                 },
                 .unsupported_file_type => |info| {
                     eb.extra.items[note_i] = @intFromEnum(try eb.addErrorMessage(.{
                         .msg = try eb.printString("file '{s}' has unsupported type '{c}'", .{
-                            stripRoot(info.file_name, root_dir), info.file_type,
+                            stripRoot(info.file_name, self.root_dir), info.file_type,
                         }),
                     }));
                 },