| author |  Andrew Kelley <andrew@ziglang.org> 2024-02-29 10:12:39-08:00 |
| committer |  GitHub <noreply@github.com> 2024-02-29 10:12:39-08:00 |
| log | af06584241ca3623b3d2495a10b6c90f18846a5a |
| tree | 9e9de64d114ab4d1125e504bda1972aff4641cb7 |
| parent | 5c0766b6c8f1aea18815206e0698953a35384a21 |
| parent | e57800610b5379f308c08421683fc44a13086821 |
| signature |  Signed by PGP key B5690EEEBB952194 |
Merge pull request #19126 from ianic/tar_case_sensitive
std.tar: fix unconditional error return2 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 | ... | @@ -622,7 +622,7 @@ fn createDirAndSymlink(dir: std.fs.Dir, link_name: []const u8, file_name: []cons |
| 622 | if (err == error.FileNotFound) { | 622 | if (err == error.FileNotFound) { |
| 623 | if (std.fs.path.dirname(file_name)) |dir_name| { | 623 | if (std.fs.path.dirname(file_name)) |dir_name| { |
| 624 | try dir.makePath(dir_name); | 624 | try dir.makePath(dir_name); |
| 625 | try dir.symLink(link_name, file_name, .{}); | 625 | return try dir.symLink(link_name, file_name, .{}); |
| 626 | } | 626 | } |
| 627 | } | 627 | } |
| 628 | return err; | 628 | return err; |
lib/std/tar/test.zig+3
| ... | @@ -464,6 +464,9 @@ test "tar case sensitivity" { | ... | @@ -464,6 +464,9 @@ test "tar case sensitivity" { |
| 464 | } | 464 | } |
| 465 | 465 | ||
| 466 | test "tar pipeToFileSystem" { | 466 | test "tar pipeToFileSystem" { |
| 467 | const builtin = @import("builtin"); | ||
| 468 | if (builtin.os.tag == .windows) return error.SkipZigTest; | ||
| 469 | |||
| 467 | // $ tar tvf | 470 | // $ tar tvf |
| 468 | // pipe_to_file_system_test/ | 471 | // pipe_to_file_system_test/ |
| 469 | // pipe_to_file_system_test/b/ | 472 | // pipe_to_file_system_test/b/ |