Merge pull request #956 from Dennisbonke/nanosleep

managarm · Dec 18, 2023 · 5ea2031 · 5ea2031
2 parents abd16bb + f0fb2aa
commit 5ea2031
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/options/ansi/generic/time-stubs.cpp b/options/ansi/generic/time-stubs.cpp
@@ -475,9 +475,10 @@ int clock_gettime(clockid_t clock, struct timespec *time) {
 	return 0;
 }
 
-int clock_nanosleep(clockid_t, int, const struct timespec *, struct timespec *) {
-	__ensure(!"clock_nanosleep() not implemented");
-	__builtin_unreachable();
+int clock_nanosleep(clockid_t clockid, int, const struct timespec *req, struct timespec *) {
+	mlibc::infoLogger() << "clock_nanosleep is implemented as nanosleep!" << frg::endlog;
+	__ensure(clockid == CLOCK_REALTIME || clockid == CLOCK_MONOTONIC);
+	return nanosleep(req, nullptr);
 }
 
 int clock_settime(clockid_t, const struct timespec *) {

diff --git a/options/posix/generic/posix_stdlib.cpp b/options/posix/generic/posix_stdlib.cpp
@@ -182,6 +182,10 @@ int mkostemps(char *pattern, int suffixlen, int flags) {
 	return mkostemp(pattern, flags);
 }
 
+int mkstemps(char *pattern, int suffixlen) {
+	return mkostemps(pattern, suffixlen, 0);
+}
+
 char *mkdtemp(char *pattern) {
 	mlibc::infoLogger() << "mlibc mkdtemp(" << pattern << ") called" << frg::endlog;
 	auto n = strlen(pattern);

diff --git a/options/posix/include/bits/posix/posix_stdlib.h b/options/posix/include/bits/posix/posix_stdlib.h
@@ -30,6 +30,7 @@ int unsetenv(const char *);
 // ----------------------------------------------------------------------------
 
 int mkstemp(char *);
+int mkstemps(char *pattern, int suffixlen);
 int mkostemp(char *, int flags);
 int mkostemps(char *pattern, int suffixlen, int flags);
 char *mkdtemp(char *path);