Skip to content

Provide fallback homedir when HOME unset #689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
themuffinator wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Provide fallback homedir when HOME unset #689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 68 additions & 39 deletions src/unix/system.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,22 +153,46 @@ bool Sys_GetAntiCheatAPI(void)

bool Sys_SetNonBlock(int fd, bool nb)
{
int ret = fcntl(fd, F_GETFL, 0);
if (ret == -1)
return false;
if ((bool)(ret & O_NONBLOCK) == nb)
return true;
return fcntl(fd, F_SETFL, ret ^ O_NONBLOCK) == 0;
int ret = fcntl(fd, F_GETFL, 0);
if (ret == -1)
return false;
if ((bool)(ret & O_NONBLOCK) == nb)
return true;
return fcntl(fd, F_SETFL, ret ^ O_NONBLOCK) == 0;
}

static void usr1_handler(int signum)
{
flush_logs = true;
flush_logs = true;
}

static void term_handler(int signum)
{
terminate = signum;
terminate = signum;
}

/*
=================
Sys_GetFallbackHomeDir

Returns a writable per-user directory when HOME is unavailable.
=================
*/
static const char *Sys_GetFallbackHomeDir(void)
{
static char path[MAX_OSPATH];
const char *xdg;
int ret;

xdg = getenv("XDG_DATA_HOME");
if (xdg && *xdg)
return xdg;

ret = Q_snprintf(path, sizeof(path), "/tmp/q2pro-%u", (unsigned)getuid());
if (ret <= 0 || ret >= (int)sizeof(path))
return "";

return path;
}

/*
Expand All @@ -178,39 +202,44 @@ Sys_Init
*/
void Sys_Init(void)
{
const char *homedir;

signal(SIGTERM, term_handler);
signal(SIGINT, term_handler);
signal(SIGTTIN, SIG_IGN);
signal(SIGTTOU, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
signal(SIGHUP, term_handler);
signal(SIGUSR1, usr1_handler);

// basedir <path>
// allows the game to run from outside the data tree
sys_basedir = Cvar_Get("basedir", DATADIR, CVAR_NOSET);

// homedir <path>
// specifies per-user writable directory for demos, screenshots, etc
if (HOMEDIR[0] == '~') {
char *s = getenv("HOME");
if (s && strlen(s) >= MAX_OSPATH - MAX_QPATH)
Sys_Error("HOME path too long");
if (s && *s) {
homedir = va("%s%s", s, &HOMEDIR[1]);
} else {
homedir = "";
}
} else {
homedir = HOMEDIR;
}
const char *homedir;
const char *fallback;

signal(SIGTERM, term_handler);
signal(SIGINT, term_handler);
signal(SIGTTIN, SIG_IGN);
signal(SIGTTOU, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
signal(SIGHUP, term_handler);
signal(SIGUSR1, usr1_handler);

// basedir <path>
// allows the game to run from outside the data tree
sys_basedir = Cvar_Get("basedir", DATADIR, CVAR_NOSET);

// homedir <path>
// specifies per-user writable directory for demos, screenshots, etc
if (HOMEDIR[0] == '~') {
char *s = getenv("HOME");
if (s && strlen(s) >= MAX_OSPATH - MAX_QPATH)
Sys_Error("HOME path too long");
if (s && *s) {
homedir = va("%s%s", s, &HOMEDIR[1]);
} else {
fallback = Sys_GetFallbackHomeDir();
if (*fallback && strlen(fallback) < MAX_OSPATH - MAX_QPATH)
homedir = va("%s%s", fallback, &HOMEDIR[1]);
else
homedir = "";
}
} else {
homedir = HOMEDIR;
}

sys_homedir = Cvar_Get("homedir", homedir, CVAR_NOSET);
sys_libdir = Cvar_Get("libdir", LIBDIR, CVAR_NOSET);
sys_homedir = Cvar_Get("homedir", homedir, CVAR_NOSET);
sys_libdir = Cvar_Get("libdir", LIBDIR, CVAR_NOSET);

tty_init_input();
tty_init_input();
}

/*
Expand Down