authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-02-29 10:12:39-08:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-02-29 10:12:39-08:00
logaf06584241ca3623b3d2495a10b6c90f18846a5a
tree9e9de64d114ab4d1125e504bda1972aff4641cb7
parent5c0766b6c8f1aea18815206e0698953a35384a21
parente57800610b5379f308c08421683fc44a13086821
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #19126 from ianic/tar_case_sensitive

std.tar: fix unconditional error return

2 files changed, 4 insertions(+), 1 deletions(-)

lib/std/tar.zig+1-1
......@@ -622,7 +622,7 @@ fn createDirAndSymlink(dir: std.fs.Dir, link_name: []const u8, file_name: []cons
622622 if (err == error.FileNotFound) {
623623 if (std.fs.path.dirname(file_name)) |dir_name| {
624624 try dir.makePath(dir_name);
625 try dir.symLink(link_name, file_name, .{});
625 return try dir.symLink(link_name, file_name, .{});
626626 }
627627 }
628628 return err;
lib/std/tar/test.zig+3
......@@ -464,6 +464,9 @@ test "tar case sensitivity" {
464464}
465465
466466test "tar pipeToFileSystem" {
467 const builtin = @import("builtin");
468 if (builtin.os.tag == .windows) return error.SkipZigTest;
469
467470 // $ tar tvf
468471 // pipe_to_file_system_test/
469472 // pipe_to_file_system_test/b/