qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-22 18:31:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make fs_userpath default to ~/quakeforge on windows.

Browse source 
The ~ gets expanded to CSIDL_LOCAL_APPDATA, $HOME, $USERPROFILE or just
".", whichever succeeds first. The usual location will be:
"C:\windows\profiles\<user>\Local Settings\Application Data".

"." is now the fallback for *nix systems too.
This commit is contained in:
Bill Currie 2013-01-23 11:10:19 +09:00
parent f68ae3ad5d
commit d139640755
2 changed files with 17 additions and 12 deletions
config.d
paths.m4
libs/util
sys.c

2
config.d/paths.m4
View file

@ -20,7 +20,7 @@ if test "x$SYSTYPE" = "xWIN32"; then
default_globalconf="~/${PACKAGE}.conf"
default_userconf="~/${PACKAGE}rc"
default_sharepath="."
default_userpath="."
default_userpath="~/${PACKAGE}"
else
default_globalconf="/etc/${PACKAGE}.conf"
eval foo="$datarootdir"

27
libs/util/sys.c
View file

@ -48,6 +48,7 @@
#endif
#ifdef HAVE_WINDOWS_H
# include "winquake.h"
# include "shlobj.h"
#endif
#ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h>
@ -861,9 +862,10 @@ Sys_CreatePath (const char *path)
char *
Sys_ExpandSquiggle (const char *path)
{
const char *home;
#ifndef _WIN32
const char *home = 0;
#ifdef _WIN32
char userpath[MAX_PATH]; // sigh, why can't windows give the size?
#else
# ifdef HAVE_GETUID
struct passwd *pwd_ent;
# endif
@ -874,24 +876,27 @@ Sys_ExpandSquiggle (const char *path)
}
#ifdef _WIN32
if (SHGetFolderPathA (0, CSIDL_LOCAL_APPDATA, 0, 0, userpath) == S_OK) {
home = userpath;
}
// LordHavoc: first check HOME to duplicate previous version behavior
// (also handy if someone wants it elsewhere than their windows directory)
home = getenv ("HOME");
if (!home)
home = getenv ("HOME");
if (!home || !home[0])
home = getenv ("WINDIR");
home = getenv ("USERPROFILE");
if (!home || !home[0])
home = 0;
#else
# ifdef HAVE_GETUID
if ((pwd_ent = getpwuid (getuid ()))) {
home = pwd_ent->pw_dir;
} else
home = getenv ("HOME");
# else
home = ""; //FIXME configurable?
# endif
#endif
if (home)
return nva ("%s%s", home, path + 1); // skip leading ~
return strdup (path);
if (!home)
home = ".";
return nva ("%s%s", home, path + 1); // skip leading ~
}