Merge pull request #1216 from Dennisbonke/fastfetch

Additions for fastfetch
managarm · Jan 8, 2025 · f147924 · f147924
2 parents c556f8c + 9b630de
commit f147924
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/options/linux/generic/sys-sysinfo.cpp b/options/linux/generic/sys-sysinfo.cpp
@@ -13,3 +13,13 @@ int sysinfo(struct sysinfo *info) {
 	}
 	return 0;
 }
+
+int get_nprocs(void) {
+	__ensure(!"Not implemented");
+	__builtin_unreachable();
+}
+
+int get_nprocs_conf(void) {
+	__ensure(!"Not implemented");
+	__builtin_unreachable();
+}
diff --git a/options/linux/include/sys/sysinfo.h b/options/linux/include/sys/sysinfo.h
@@ -32,6 +32,9 @@ struct sysinfo {
 
 int sysinfo(struct sysinfo *__info);
 
+int get_nprocs(void);
+int get_nprocs_conf(void);
+
 #endif /* !__MLIBC_ABI_ONLY */
 
 #ifdef __cplusplus

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