himitsu: Fix compilation with new stdlib v1 APPLIED

Alexey Yerin: 1
 Fix compilation with new stdlib

 4 files changed, 6 insertions(+), 6 deletions(-)

[PATCH himitsu] Fix compilation with new stdlib Export this patch

---
 cmd/himitsu-init/main.ha | 4 ++--
 cmd/himitsud/main.ha     | 4 ++--
 cmd/himitsud/socket.ha   | 2 +-
 secstore/secstore.ha     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmd/himitsu-init/main.ha b/cmd/himitsu-init/main.ha
index 334ff69..111ad04 100644
--- a/cmd/himitsu-init/main.ha
+++ b/cmd/himitsu-init/main.ha
@@ -133,8 +133,8 @@ fn writeconf() void = {
 
 	path::set(&buf, confdir, "config.ini")!;
 	const confpath = path::string(&buf);
-	const file = match (os::create(confpath, 0o644, fs::flags::WRONLY,
-		fs::flags::EXCL)) {
+	const file = match (os::create(confpath, 0o644, fs::flag::WRONLY,
+		fs::flag::EXCL)) {
 	case let file: io::file =>
 		yield file;
 	case errors::exists =>
diff --git a/cmd/himitsud/main.ha b/cmd/himitsud/main.ha
index f89355d..303c7c1 100644
--- a/cmd/himitsud/main.ha
+++ b/cmd/himitsud/main.ha
@@ -34,8 +34,8 @@ export fn main() void = {
 	};
 	defer secstore::close(&store);
 
-	signal::block(signal::SIGINT, signal::SIGTERM);
-	const sigfd = signal::signalfd(signal::SIGINT, signal::SIGTERM)!;
+	signal::block(signal::sig::INT, signal::sig::TERM);
+	const sigfd = signal::signalfd(signal::sig::INT, signal::sig::TERM)!;
 	defer io::close(sigfd)!;
 
 	const conf = match (config::load()) {
diff --git a/cmd/himitsud/socket.ha b/cmd/himitsud/socket.ha
index 5f09243..52336f7 100644
--- a/cmd/himitsud/socket.ha
+++ b/cmd/himitsud/socket.ha
@@ -64,7 +64,7 @@ fn bind(
 	case let err: net::error =>
 		log::fatal(net::strerror(err));
 	};
-	const sock = match (unix::listen(sockpath, net::sockflags::NOCLOEXEC)) {
+	const sock = match (unix::listen(sockpath, net::sockflag::NOCLOEXEC)) {
 	case let l: net::socket =>
 		yield l;
 	case let err: net::error =>
diff --git a/secstore/secstore.ha b/secstore/secstore.ha
index fad9a43..965bdfa 100644
--- a/secstore/secstore.ha
+++ b/secstore/secstore.ha
@@ -214,7 +214,7 @@ fn openat(dir: str) (secstore | error) = {
 	let buf = path::init()!;
 	path::set(&buf, dir, "index")!;
 
-	const index = os::open(path::string(&buf), fs::flags::RDWR)?;
+	const index = os::open(path::string(&buf), fs::flag::RDWR)?;
 	return secstore {
 		key = void,
 		state = state::HARD_LOCKED,
-- 
2.41.0

Armin Preiml <apreiml@strohwolke.at>

1 year, 3 months ago

Thanks!

To https://git.sr.ht/~sircmpwn/himitsu
   734a34b..  master -> master