projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added abstractions for using getpwuid()
[rocksndiamonds.git]
/
src
/
libgame
/
setup.c
diff --git
a/src/libgame/setup.c
b/src/libgame/setup.c
index 9f82d3a061bb17b4c6e71bc44033627176a89b3b..f1b87e170499063fbc93b0b01d6afd404e47a27c 100644
(file)
--- a/
src/libgame/setup.c
+++ b/
src/libgame/setup.c
@@
-18,11
+18,6
@@
#include "platform.h"
#include "platform.h"
-#if !defined(PLATFORM_WIN32)
-#include <pwd.h>
-#include <sys/param.h>
-#endif
-
#include "setup.h"
#include "joystick.h"
#include "text.h"
#include "setup.h"
#include "joystick.h"
#include "text.h"
@@
-1504,10
+1499,10
@@
char *getHomeDir(void)
{
if ((dir = getenv("HOME")) == NULL)
{
{
if ((dir = getenv("HOME")) == NULL)
{
-
struct passwd *pwd
;
+
dir = getUnixHomeDir()
;
- if (
(pwd = getpwuid(getuid()))
!= NULL)
- dir = getStringCopy(
pwd->pw_
dir);
+ if (
dir
!= NULL)
+ dir = getStringCopy(dir);
else
dir = ".";
}
else
dir = ".";
}