sysdeps/managarm: Misc fixes

managarm · Jan 21, 2025 · 82eca57 · 82eca57
1 parent 3c18eaf
commit 82eca57
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/sysdeps/managarm/generic/drm.cpp b/sysdeps/managarm/generic/drm.cpp
@@ -1170,6 +1170,12 @@ int ioctl_drm(int fd, unsigned long request, void *arg, int *result, HelHandle h
 			                    << frg::endlog;
 			return 0;
 		}
+		case DRM_IOCTL_WAIT_VBLANK: {
+			mlibc::infoLogger() << "\e[35mmlibc: DRM_IOCTL_WAIT_VBLANK"
+			                       " is a noop\e[39m"
+			                    << frg::endlog;
+			return 0;
+		}
 		case DRM_IOCTL_PRIME_HANDLE_TO_FD: {
 			auto param = reinterpret_cast<drm_prime_handle *>(arg);
 

diff --git a/sysdeps/managarm/generic/ioctl.cpp b/sysdeps/managarm/generic/ioctl.cpp
@@ -7,6 +7,7 @@
 #include <linux/sockios.h>
 #include <linux/usb/cdc-wdm.h>
 #include <linux/vt.h>
+#include <scsi/sg.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netinet/in.h>

diff --git a/sysdeps/managarm/generic/mount.cpp b/sysdeps/managarm/generic/mount.cpp
@@ -17,9 +17,9 @@ sys_mount(const char *source, const char *target, const char *fstype, unsigned l
 	SignalGuard sguard;
 
 	managarm::posix::MountRequest<MemoryAllocator> req(getSysdepsAllocator());
-	req.set_path(frg::string<MemoryAllocator>(getSysdepsAllocator(), source));
-	req.set_target_path(frg::string<MemoryAllocator>(getSysdepsAllocator(), target));
-	req.set_fs_type(frg::string<MemoryAllocator>(getSysdepsAllocator(), fstype));
+	req.set_path(frg::string<MemoryAllocator>(getSysdepsAllocator(), source ? source : ""));
+	req.set_target_path(frg::string<MemoryAllocator>(getSysdepsAllocator(), target ? target : ""));
+	req.set_fs_type(frg::string<MemoryAllocator>(getSysdepsAllocator(), fstype ? fstype : ""));
 
 	auto [offer, send_head, send_tail, recv_resp] = exchangeMsgsSync(
 	    getPosixLane(),

diff --git a/sysdeps/managarm/generic/socket.cpp b/sysdeps/managarm/generic/socket.cpp
@@ -649,6 +649,16 @@ int sys_setsockopt(int fd, int layer, int number, const void *buffer, socklen_t
 		) << "\e[31mmlibc: setsockopt() call with SOL_SOCKET and SO_RCVTIMEO is unimplemented\e[39m"
 		  << frg::endlog;
 		return 0;
+	} else if (layer == SOL_SOCKET && number == SO_PASSSEC) {
+		mlibc::infoLogger(
+		) << "\e[31mmlibc: setsockopt() call with SOL_SOCKET and SO_PASSSEC is unimplemented\e[39m"
+		  << frg::endlog;
+		return ENOSYS;
+	} else if (layer == SOL_SOCKET && number == SO_TIMESTAMP) {
+		mlibc::infoLogger(
+		) << "\e[31mmlibc: setsockopt() call with SOL_SOCKET and SO_TIMESTAMP is unimplemented\e[39m"
+		  << frg::endlog;
+		return 0;
 	} else {
 		mlibc::panicLogger() << "\e[31mmlibc: Unexpected setsockopt() call, layer: " << layer
 		                     << " number: " << number << "\e[39m" << frg::endlog;