hare

commit 59e88dfbd5e0d1d92b76214c563a258e5f7ad06a
parent 65e305e063254a520852ae5a291db9f4dcc4bd09
Author: Sebastian <sebastian@sebsite.pw>
Date:   Sat, 28 Oct 2023 02:36:18 -0400

mime: simplify and improve load_systemdb

Signed-off-by: Sebastian <sebastian@sebsite.pw>

Diffstat:
M
mime/system.ha
 | 
36
+++++++++++-------------------------

1 file changed, 11 insertions(+), 25 deletions(-)
diff --git a/mime/system.ha b/mime/system.ha
@@ -8,6 +8,7 @@ use fs;
 use io;
 use os;
 use strings;
+use types;
 
 // Path to the system MIME database.
 export def SYSTEM_DB: str = "/etc/mime.types";
@@ -17,34 +18,22 @@ export def SYSTEM_DB: str = "/etc/mime.types";
 	load_systemdb(): void;
 };
 
-fn load_systemdb() (void | fs::error | io::error) = {
+fn load_systemdb() (void | fs::error | io::error | utf8::invalid) = {
 	const file = os::open(SYSTEM_DB)?;
+	defer io::close(file)!;
 
-	let buf: [os::BUFSZ]u8 = [0...];
-	const strm = bufio::init(file, buf, []);
+	let sc = bufio::newscanner(file, types::SIZE_MAX);
+	defer bufio::finish(&sc);
 
 	for (true) {
-		const line = match (bufio::read_line(&strm)) {
-		case let bytes: []u8 =>
-			yield match (strings::fromutf8(bytes)) {
-			case utf8::invalid =>
-				fmt::errorln("Warning: /etc/mime.types contains invalid UTF-8")!;
-				io::close(&strm)?;
-				io::close(file)?;
-				return;
-			case let s: str =>
-				yield s;
-			};
-		case let err: io::error =>
-			io::close(&strm): void;
-			io::close(file): void;
-			return err;
+		let line = match (bufio::scan_line(&sc)?) {
 		case io::EOF =>
 			break;
+		case let s: const str =>
+			yield s;
 		};
-		defer free(line);
 
-		const line = strings::trim(line);
+		line = strings::trim(line);
 		if (strings::hasprefix(line, "#") || len(line) == 0) {
 			continue;
 		};
@@ -72,14 +61,11 @@ fn load_systemdb() (void | fs::error | io::error) = {
 		};
 		register_heap(entry);
 	};
-
-	io::close(&strm)?;
-	io::close(file)?;
 };
 
-fn register_heap(mime: *mimetype...) void = {
+fn register_heap(mime: *mimetype) void = {
 	let i = len(heap_db);
-	append(heap_db, mime...);
+	append(heap_db, mime);
 	for (i < len(heap_db); i += 1) {
 		hashtable_insert(heap_db[i]);
 	};