authorgravatar for igor.anic@gmail.comIgor Anić <igor.anic@gmail.com> 2023-12-11 20:46:27+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-13 19:37:33-07:00
logc76abe0e183ef513b9ee651b052c7f99c33c139c
treeeebf20bdc48c97eaf308a7f60efe119a6fe29ae0
parent4a6d67ab1a26e0c89d55453877c1fd8b03ab1976

tar: use file word in less places

1 files changed, 26 insertions(+), 26 deletions(-)

lib/std/tar.zig+26-26
......@@ -58,7 +58,7 @@ pub const Options = struct {
5858 },
5959 unsupported_file_type: struct {
6060 file_name: []const u8,
61 file_type: Header.FileType,
61 file_type: Header.Kind,
6262 },
6363 };
6464
......@@ -90,7 +90,7 @@ pub const Header = struct {
9090
9191 bytes: *const [SIZE]u8,
9292
93 pub const FileType = enum(u8) {
93 pub const Kind = enum(u8) {
9494 normal_alias = 0,
9595 normal = '0',
9696 hard_link = '1',
......@@ -142,7 +142,7 @@ pub const Header = struct {
142142 return @intCast(try header.numeric(100, 8));
143143 }
144144
145 pub fn fileSize(header: Header) !u64 {
145 pub fn size(header: Header) !u64 {
146146 return header.numeric(124, 12);
147147 }
148148
......@@ -159,8 +159,8 @@ pub const Header = struct {
159159 return header.str(345, 155);
160160 }
161161
162 pub fn fileType(header: Header) FileType {
163 const result: FileType = @enumFromInt(header.bytes[156]);
162 pub fn kind(header: Header) Kind {
163 const result: Kind = @enumFromInt(header.bytes[156]);
164164 if (result == .normal_alias) return .normal;
165165 return result;
166166 }
......@@ -242,7 +242,7 @@ pub fn pipeToFileSystem(dir: std.fs.Dir, reader: anytype, options: Options) !voi
242242 var iter = tarReader(reader, options.diagnostics);
243243
244244 while (try iter.next()) |file| {
245 switch (file.file_type) {
245 switch (file.kind) {
246246 .directory => {
247247 const file_name = try stripComponents(file.name, options.strip_components);
248248 if (file_name.len != 0 and !options.exclude_empty_directories) {
......@@ -339,7 +339,7 @@ test "tar run Go test cases" {
339339 size: usize = 0,
340340 mode: u32 = 0,
341341 link_name: []const u8 = &[0]u8{},
342 file_type: Header.FileType = .normal,
342 kind: Header.Kind = .normal,
343343 truncated: bool = false, // when there is no file body, just header, usefull for huge files
344344 };
345345
......@@ -376,7 +376,7 @@ test "tar run Go test cases" {
376376 },
377377 .{
378378 .path = "sparse-formats.tar",
379 .err = error.TarUnsupportedFileType,
379 .err = error.TarUnsupportedHeader,
380380 },
381381 .{
382382 .path = "star.tar",
......@@ -427,7 +427,7 @@ test "tar run Go test cases" {
427427 .{
428428 .name = "a/b",
429429 .size = 0,
430 .file_type = .symbolic_link,
430 .kind = .symbolic_link,
431431 .mode = 0o777,
432432 .link_name = "123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100",
433433 },
......@@ -448,7 +448,7 @@ test "tar run Go test cases" {
448448 .{
449449 .name = "foo",
450450 .size = 999,
451 .file_type = .normal,
451 .kind = .normal,
452452 .mode = 0o640,
453453 },
454454 },
......@@ -489,7 +489,7 @@ test "tar run Go test cases" {
489489 .{
490490 .name = "P1050238.JPG.log",
491491 .size = 14,
492 .file_type = .normal,
492 .kind = .normal,
493493 .mode = 0o664,
494494 },
495495 },
......@@ -504,13 +504,13 @@ test "tar run Go test cases" {
504504 .{
505505 .name = "small.txt",
506506 .size = 5,
507 .file_type = .normal,
507 .kind = .normal,
508508 .mode = 0o644,
509509 },
510510 .{
511511 .name = "small2.txt",
512512 .size = 11,
513 .file_type = .normal,
513 .kind = .normal,
514514 .mode = 0o644,
515515 },
516516 },
......@@ -525,14 +525,14 @@ test "tar run Go test cases" {
525525 .{
526526 .name = "GNU2/GNU2/long-path-name",
527527 .link_name = "GNU4/GNU4/long-linkpath-name",
528 .file_type = .symbolic_link,
528 .kind = .symbolic_link,
529529 },
530530 },
531531 },
532532 .{
533533 // has gnu type D (directory) and S (sparse) blocks
534534 .path = "gnu-incremental.tar",
535 .err = error.TarUnsupportedFileType,
535 .err = error.TarUnsupportedHeader,
536536 },
537537 .{
538538 // should use values only from last pax header
......@@ -541,7 +541,7 @@ test "tar run Go test cases" {
541541 .{
542542 .name = "bar",
543543 .link_name = "PAX4/PAX4/long-linkpath-name",
544 .file_type = .symbolic_link,
544 .kind = .symbolic_link,
545545 },
546546 },
547547 },
......@@ -620,7 +620,7 @@ test "tar run Go test cases" {
620620 .files = &[_]Case.File{
621621 .{
622622 .name = "123456789/" ** 30,
623 .file_type = .directory,
623 .kind = .directory,
624624 },
625625 },
626626 },
......@@ -668,7 +668,7 @@ test "tar run Go test cases" {
668668 const expected = case.files[i];
669669 try std.testing.expectEqualStrings(expected.name, actual.name);
670670 try std.testing.expectEqual(expected.size, actual.size);
671 try std.testing.expectEqual(expected.file_type, actual.file_type);
671 try std.testing.expectEqual(expected.kind, actual.kind);
672672 try std.testing.expectEqual(expected.mode, actual.mode);
673673 try std.testing.expectEqualStrings(expected.link_name, actual.link_name);
674674
......@@ -955,7 +955,7 @@ fn TarReader(comptime ReaderType: type) type {
955955 link_name: []const u8, // target name of symlink
956956 size: usize, // size of the file in bytes
957957 mode: u32,
958 file_type: Header.FileType,
958 kind: Header.Kind,
959959
960960 reader: ReaderType,
961961
......@@ -1004,7 +1004,7 @@ fn TarReader(comptime ReaderType: type) type {
10041004 .name = self.file_name_buffer[0..0],
10051005 .link_name = self.link_name_buffer[0..0],
10061006 .size = 0,
1007 .file_type = .normal,
1007 .kind = .normal,
10081008 .mode = 0,
10091009 .reader = self.reader,
10101010 };
......@@ -1026,14 +1026,14 @@ fn TarReader(comptime ReaderType: type) type {
10261026 self.initFile();
10271027
10281028 while (try self.readHeader()) |header| {
1029 const file_type = header.fileType();
1030 const size: usize = @intCast(try header.fileSize());
1029 const kind = header.kind();
1030 const size: usize = @intCast(try header.size());
10311031 self.padding = blockPadding(size);
10321032
1033 switch (file_type) {
1033 switch (kind) {
10341034 // File types to retrun upstream
10351035 .directory, .normal, .symbolic_link => {
1036 self.file.file_type = file_type;
1036 self.file.kind = kind;
10371037 self.file.mode = try header.mode();
10381038
10391039 // set file attributes if not already set by prefix/extended headers
......@@ -1083,10 +1083,10 @@ fn TarReader(comptime ReaderType: type) type {
10831083 },
10841084 // All other are unsupported header types
10851085 else => {
1086 const d = self.diagnostics orelse return error.TarUnsupportedFileType;
1086 const d = self.diagnostics orelse return error.TarUnsupportedHeader;
10871087 try d.errors.append(d.allocator, .{ .unsupported_file_type = .{
10881088 .file_name = try d.allocator.dupe(u8, header.name()),
1089 .file_type = file_type,
1089 .file_type = kind,
10901090 } });
10911091 },
10921092 }