---
 cmd/hiq/main.ha | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/cmd/hiq/main.ha b/cmd/hiq/main.ha
index ad0460e..9f2b5e3 100644
--- a/cmd/hiq/main.ha
+++ b/cmd/hiq/main.ha
@@ -74,16 +74,20 @@ export fn main() void = {
 		};
 	};
 
-	let buf = path::init();
-	// TODO: Bubble up dirs::runtime errors
-	const sockpath = path::set(&buf, dirs::runtime()!, "himitsu")!;
-	let conn = match (unix::connect(sockpath)) {
+	let conn = match (client::connect()) {
 	case let s: net::socket =>
 		yield s;
-	case errors::noentry =>
-		fmt::fatal("error: himitsud connection failed (is it running?)");
+	case let e: client::hierror =>
+		fmt::fatal(e);
+	case let e: io::error =>
+		fmt::fatal("error:", io::strerror(e));
 	case let e: net::error =>
-		fmt::fatal("error:", net::strerror(e));
+		match (e) {
+		case errors::noentry =>
+			fmt::fatal("error: himitsud connection failed (is it running?)");
+		case =>
+			fmt::fatal("error:", net::strerror(e));
+		};
 	};
 	defer io::close(conn)!;
 
-- 
2.39.2

Applied. Thanks!

The v2 of this patch was actually nacked by Drew, I've sent

[PATCH himitsu] hiq: use himitsu::client to run queries

which supersedes this and rewrites a lot more of hiq.

On 5/5/23 14:44, sam@samnystrom.dev wrote:
> The v2 of this patch was actually nacked by Drew, I've sent
> 
> [PATCH himitsu] hiq: use himitsu::client to run queries
> 
> which supersedes this and rewrites a lot more of hiq.

Ups. I've reverted it.