sysdeps/managarm: Implement signal() and waitpid()

options/ansi/generic/signal-stubs.cpp

@@ -3,6 +3,7 @@
 #include <signal.h>
 
 #include <frigg/debug.hpp>
+#include <mlibc/sysdeps.hpp>
 
 void __signalDfl(int signal) {
 	__ensure(!"Not implemented");
@@ -14,8 +15,17 @@ void __signalIgn(int signal) {
 	__ensure(!"Not implemented");
 }
 
-__sighandler signal(int sig, __sighandler handler) {
+__sighandler signal(int sn, __sighandler handler) {
 	frigg::infoLogger() << "\e[31mmlibc: signal() always returns SIG_DFL\e[39m" << frigg::endLog;
+	if(handler == SIG_DFL || handler == SIG_IGN) {
+	}else{
+		struct sigaction sa;
+		sa.sa_handler = handler;
+		sa.sa_flags = 0;
+		sa.sa_mask = 0;
+		if(mlibc::sys_sigaction(sn, &sa, nullptr))
+			frigg::panicLogger() << "\e[31mmlibc: sys_sigaction() failed\e[39m" << frigg::endLog;
+	}
 	return SIG_DFL;
 }
 

options/ansi/include/stdio.h

@@ -157,7 +157,8 @@ int fileno_unlocked(FILE *);
 int fflush_unlocked(FILE *);
 int fgetc_unlocked(FILE *);
 int fputc_unlocked(int, FILE *);
-size_t fread_unlocked(void *, size_t, size_t, FILE *);
+size_t fread_unlocked(void *__restrict, size_t, size_t, FILE *__restrict);
+size_t fwrite_unlocked(const void *__restrict, size_t, size_t, FILE *__restrict);
 
 char *fgets_unlocked(char *, int, FILE *);
 int fputs_unlocked(const char *, FILE *);

options/internal/include/mlibc/sysdeps.hpp

@@ -52,7 +52,7 @@ void sys_execve(const char *path, char *const argv[], char *const envp[]);
 int sys_timerfd_create(int flags, int *fd);
 int sys_timerfd_settime(int fd, int flags,
 		const struct itimerspec *value);
-int sys_signalfd_create(int flags, int *fd);
+int sys_signalfd_create(sigset_t, int flags, int *fd);
 int sys_chroot(const char *path);
 int sys_mkdir(const char *path);
 int sys_symlink(const char *target_path, const char *link_path);

options/linux/generic/sys-signalfd.cpp

@@ -4,9 +4,9 @@
 
 #include <mlibc/sysdeps.hpp>
 
-int signalfd(int fd, const sigset_t *, int flags) {
+int signalfd(int fd, const sigset_t *mask, int flags) {
 	__ensure(fd == -1);
-	if(mlibc::sys_signalfd_create(flags, &fd))
+	if(mlibc::sys_signalfd_create(*mask, flags, &fd))
 		return -1;
 	return fd;
 }

sysdeps/managarm/generic/file.cpp

@@ -1096,7 +1096,7 @@ int sys_timerfd_settime(int fd, int flags,
 	return 0;
 }
 
-int sys_signalfd_create(int flags, int *fd) {
+int sys_signalfd_create(sigset_t mask, int flags, int *fd) {
 	__ensure(!(flags & ~(SFD_CLOEXEC | SFD_NONBLOCK)));
 
 	if(flags & SFD_NONBLOCK)
@@ -1113,6 +1113,7 @@ int sys_signalfd_create(int flags, int *fd) {
 	managarm::posix::CntRequest<MemoryAllocator> req(getAllocator());
 	req.set_request_type(managarm::posix::CntReqType::SIGNALFD_CREATE);
 	req.set_flags(proto_flags);
+	req.set_sigset(mask);
 
 	frigg::String<MemoryAllocator> ser(getAllocator());
 	req.SerializeToString(&ser);

sysdeps/managarm/generic/fork-exec.cpp

@@ -29,11 +29,42 @@
 namespace mlibc {
 
 int sys_waitpid(pid_t pid, int *status, int flags) {
-	frigg::infoLogger() << "mlibc: Broken waitpid("
-			<< pid << ", " << flags << ") called!" << frigg::endLog;
-	__ensure(flags & WNOHANG);
-	errno = ECHILD;
-	return -1;
+	HelAction actions[3];
+	globalQueue.trim();
+
+	managarm::posix::CntRequest<MemoryAllocator> req(getAllocator());
+	req.set_request_type(managarm::posix::CntReqType::WAIT);
+	req.set_pid(pid);
+	req.set_flags(flags);
+
+	frigg::String<MemoryAllocator> ser(getAllocator());
+	req.SerializeToString(&ser);
+	actions[0].type = kHelActionOffer;
+	actions[0].flags = kHelItemAncillary;
+	actions[1].type = kHelActionSendFromBuffer;
+	actions[1].flags = kHelItemChain;
+	actions[1].buffer = ser.data();
+	actions[1].length = ser.size();
+	actions[2].type = kHelActionRecvInline;
+	actions[2].flags = 0;
+	HEL_CHECK(helSubmitAsync(kHelThisThread, actions, 3,
+			globalQueue.getQueue(), 0, 0));
+
+	auto element = globalQueue.dequeueSingle();
+	auto offer = parseSimple(element);
+	auto send_req = parseSimple(element);
+	auto recv_resp = parseInline(element);
+
+	HEL_CHECK(offer->error);
+	HEL_CHECK(send_req->error);
+	HEL_CHECK(recv_resp->error);
+
+	managarm::posix::SvrResponse<MemoryAllocator> resp(getAllocator());
+	resp.ParseFromArray(recv_resp->data, recv_resp->length);
+	__ensure(resp.error() == managarm::posix::Errors::SUCCESS);
+	if(status)
+		*status = resp.mode();
+	return resp.pid();
 }
 
 void sys_exit(int status) {