hare

commit 232209ea43050f1056f043df0eec19a81f1b4885
parent 5d7ebf141050eb1b41536c8d006042a441b43c69
Author: Ember Sawady <ecs@d2evs.net>
Date:   Tue, 26 Sep 2023 07:32:49 +0000

format::tar: make use of io::readall

Signed-off-by: Ember Sawady <ecs@d2evs.net>

Diffstat:
M
format/tar/reader.ha
 | 
33
+++++----------------------------
M
format/tar/types.ha
 | 
7
+------

2 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/format/tar/reader.ha b/format/tar/reader.ha
@@ -32,26 +32,12 @@ export fn read(src: io::handle) reader = {
 // Note that reading from the header will modify the file size.
 export fn next(rd: *reader) (entry | error | io::EOF) = {
 	static let buf: [BLOCKSZ]u8 = [0...];
-	match (io::read(rd.src, buf)?) {
-	case let z: size =>
-		if (z != len(buf)) {
-			return truncated;
-		};
-	case io::EOF =>
-		return truncated;
-	};
+	io::readall(rd.src, buf)?;
 
 	if (zeroed(buf)) {
-		match (io::read(rd.src, buf)?) {
-		case let z: size =>
-			if (z != len(buf)) {
-				return truncated;
-			};
-		case io::EOF =>
-			return truncated;
-		};
+		io::readall(rd.src, buf)?;
 		if (!zeroed(buf)) {
-			return truncated;
+			return invalid;
 		};
 		return io::EOF;
 	};
@@ -148,18 +134,9 @@ fn file_read(s: *io::stream, buf: []u8) (size | io::EOF | io::error) = {
 	ent.remain -= z;
 
 	// Read until we reach the block size
-	static let buf: [BLOCKSZ]u8 = [0...];
 	if (ent.remain == 0 && ent.orig % BLOCKSZ != 0) {
-		let remain = BLOCKSZ - (ent.orig % BLOCKSZ);
-		for (remain > 0) {
-			match (io::read(ent.src, buf[..remain])?) {
-			case let z: size =>
-				remain -= z;
-			case io::EOF =>
-				// TODO: Set a truncated flag or something
-				break;
-			};
-		};
+		static let buf: [BLOCKSZ]u8 = [0...];
+		io::readall(ent.src, buf[..BLOCKSZ - (ent.orig % BLOCKSZ)])?;
 	};
 
 	return z;
diff --git a/format/tar/types.ha b/format/tar/types.ha
@@ -43,20 +43,15 @@ export type entry_type = enum u8 {
 	FIFO,
 };
 
-// Returned if the source file size is not aligned on [[BLOCKSZ]].
-export type truncated = !void;
-
 // Returned if the source file does not contain a valid ustar archive.
 export type invalid = !void;
 
 // Tagged union of all possible error types.
-export type error = !(truncated | invalid | io::error);
+export type error = !(invalid | io::error);
 
 // Converts an [[error]] to a human-friendly representation.
 export fn strerror(err: error) const str = {
 	match (err) {
-	case truncated =>
-		return "Tar file is truncated";
 	case invalid =>
 		return "Tar file is invalid";
 	case let err: io::error =>