mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 15:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

mlibc: backport utmpx deadlock fixes

Browse Source
This commit is contained in:
Matheus
2026-04-11 22:05:38 -03:00
parent baf91b8d86
commit 07a3124d2b
1 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/mlibc/jinx-working-patch.patch
+56
View File
@@ -129,6 +129,62 @@ index 299d9d3..d32237c 100644
} }
struct protoent *getprotobyname(const char *) { struct protoent *getprotobyname(const char *) {
diff --git mlibc-clean/options/posix/generic/utmpx.cpp mlibc-workdir/options/posix/generic/utmpx.cpp
index 2c6252c..1d9064c 100644
--- mlibc-clean/options/posix/generic/utmpx.cpp
+++ mlibc-workdir/options/posix/generic/utmpx.cpp
@@ -77,10 +77,10 @@ void setutxent(void) {
}
struct utmpx *getutxent(void) {
- frg::unique_lock lock{utmpxMutex};
-
if(!utmpxFd)
setutxent();
+ frg::unique_lock lock{utmpxMutex};
+
if(!utmpxFd) {
errno = ENOENT;
return nullptr;
@@ -95,10 +95,10 @@ struct utmpx *getutxent(void) {
}
struct utmpx *pututxline(const struct utmpx *ut) {
- frg::unique_lock lock{utmpxMutex};
-
if(!utmpxFd)
setutxent();
+ frg::unique_lock lock{utmpxMutex};
+
if(!utmpxFd) {
errno = ENOENT;
return nullptr;
@@ -135,10 +135,10 @@ int utmpxname(const char *file) {
}
struct utmpx *getutxid(const struct utmpx *ut) {
- frg::unique_lock lock{utmpxMutex};
-
if(!utmpxFd)
setutxent();
+
+ frg::unique_lock lock{utmpxMutex};
if(!utmpxFd) {
errno = ENOENT;
return nullptr;
@@ -153,10 +153,10 @@ struct utmpx *getutxid(const struct utmpx *ut) {
}
struct utmpx *getutxline(const struct utmpx *ut) {
- frg::unique_lock lock{utmpxMutex};
-
if(!utmpxFd)
setutxent();
+ frg::unique_lock lock{utmpxMutex};
+
if(!utmpxFd) {
errno = ENOENT;
return nullptr;
diff --git mlibc-clean/options/posix/include/mlibc/posix-sysdeps.hpp mlibc-workdir/options/posix/include/mlibc/posix-sysdeps.hpp diff --git mlibc-clean/options/posix/include/mlibc/posix-sysdeps.hpp mlibc-workdir/options/posix/include/mlibc/posix-sysdeps.hpp
index 3666050..ecfc1ae 100644 index 3666050..ecfc1ae 100644
--- mlibc-clean/options/posix/include/mlibc/posix-sysdeps.hpp --- mlibc-clean/options/posix/include/mlibc/posix-sysdeps.hpp