Merge pull request #562 from suve/getpwuid-fallback

Fallback to getpwuid() if $HOME is unset
kraflab · Dec 23, 2024 · fe0dfa0 · fe0dfa0
2 parents 3b94adb + 73c99b6
commit fe0dfa0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/prboom2/CMakeLists.txt b/prboom2/CMakeLists.txt
@@ -91,6 +91,7 @@ check_symbol_exists(mmap "sys/mman.h" HAVE_MMAP)
 check_symbol_exists(CreateFileMapping "windows.h" HAVE_CREATE_FILE_MAPPING)
 check_symbol_exists(strsignal "string.h" HAVE_STRSIGNAL)
 check_symbol_exists(mkstemp "stdlib.h" HAVE_MKSTEMP)
+check_symbol_exists(getpwuid "unistd.h;sys/types.h;pwd.h" HAVE_GETPWUID)
 
 include(CheckIncludeFile)
 

diff --git a/prboom2/cmake/config.h.cin b/prboom2/cmake/config.h.cin
@@ -14,6 +14,7 @@
 #cmakedefine HAVE_CREATE_FILE_MAPPING
 #cmakedefine HAVE_STRSIGNAL
 #cmakedefine HAVE_MKSTEMP
+#cmakedefine HAVE_GETPWUID
 
 #cmakedefine HAVE_SYS_WAIT_H
 #cmakedefine HAVE_UNISTD_H

diff --git a/prboom2/src/SDL/i_system.c b/prboom2/src/SDL/i_system.c
@@ -56,6 +56,10 @@
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#ifdef HAVE_GETPWUID
+#include <sys/types.h>
+#include <pwd.h>
+#endif
 #endif
 
 #ifdef _MSC_VER
@@ -315,7 +319,13 @@ const char *I_ConfigDir(void)
     const char *home = M_getenv("HOME");
     if (!home)
     {
-      home = "/";
+#ifdef HAVE_GETPWUID
+      struct passwd *user_info = getpwuid(getuid());
+      if (user_info != NULL)
+        home = user_info->pw_dir;
+      else
+#endif
+        home = "/";
     }
 
     // First, try legacy directory.