ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #326 from linkmauve/fix-xdg-config-home 

Core: Obey the XDG basedir specification for environment variables
This commit is contained in:
endrift 2016-09-10 22:24:16 -07:00 committed by GitHub
parent 67a09eaa1d 93f8352154
commit 2155a30172
3 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
doc/mgba-qt.6
View File

@ -1,4 +1,4 @@
.\" Copyright (c) 2015 Anthony J. Bentley <anthony@anjbe.name>
.\" Copyright (c) 2015-2016 Anthony J. Bentley <anthony@anjbe.name>
.\"
.\" This Source Code Form is subject to the terms of the Mozilla Public
.\" License, v. 2.0. If a copy of the MPL was not distributed with this
@ -103,13 +103,23 @@ The default controls are as follows:
.It Frame advance
.Ao Cm Ctrl Ac Ns \(hy Ns Cm n
.El
.Sh ENVIRONMENT
.Bl -tag -width Ds -compact
.It Ev XDG_CONFIG_HOME
The location where
.Nm
will look for the configuration directory.
If not set,
.Pa ~/.config
is used.
.El
.Sh FILES
.Bl -tag -width ~/.config/mgba/config.ini -compact
.It Pa ~/.config/mgba/config.ini
.Bl -tag -width Ds -compact
.It Pa $XDG_CONFIG_HOME/mgba/config.ini
Default
.Xr mgba 6
configuration file.
.It Pa ~/.config/mgba/qt.ini
.It Pa $XDG_CONFIG_HOME/mgba/qt.ini
Default
.Nm mgba-qt
configuration file.
@ -121,7 +131,7 @@ will read
and
.Pa qt.ini
from the current directory instead of
.Pa ~/.config/mgba .
.Pa $XDG_CONFIG_HOME/mgba .
.El
.Sh AUTHORS
.An Jeffrey Pfau Aq Mt jeffrey@endrift.com

22
doc/mgba.6
View File

@ -1,4 +1,4 @@
.\" Copyright (c) 2015 Anthony J. Bentley <anthony@anjbe.name>
.\" Copyright (c) 2015-2016 Anthony J. Bentley <anthony@anjbe.name>
.\"
.\" This Source Code Form is subject to the terms of the Mozilla Public
.\" License, v. 2.0. If a copy of the MPL was not distributed with this
@ -230,11 +230,21 @@ If
.Ar count
is not specified, examine 16 bytes, 8 halfwords, or 4 words.
.El
.Sh FILES
.Bl -tag -width ~/.config/mgba/config.ini -compact
.It Pa ~/.config/mgba/config.ini
Default
.Sh ENVIRONMENT
.Bl -tag -width Ds -compact
.It Ev XDG_CONFIG_HOME
The location where
.Nm
will look for the configuration directory.
If not set,
.Pa ~/.config
is used.
.El
.Sh FILES
.Bl -tag -width Ds -compact
.It Pa $XDG_CONFIG_HOME/mgba/config.ini
Default
.Xr mgba 6
configuration file.
.It Pa portable.ini
If this file exists in the current directory,
@ -242,7 +252,7 @@ If this file exists in the current directory,
will read
.Pa config.ini
from the current directory instead of
.Pa ~/.config/mgba .
.Pa $XDG_CONFIG_HOME/mgba .
.El
.Sh AUTHORS
.An Jeffrey Pfau Aq Mt jeffrey@endrift.com

6
src/core/config.c
View File

@ -227,6 +227,12 @@ void mCoreConfigDirectory(char* out, size_t outLength) {
return;
}
char* xdgConfigHome = getenv("XDG_CONFIG_HOME");
if (xdgConfigHome && xdgConfigHome[0] == '/') {
snprintf(out, outLength, "%s/%s", xdgConfigHome, binaryName);
mkdir(out, 0755);
return;
}
char* home = getenv("HOME");
snprintf(out, outLength, "%s/.config", home);
mkdir(out, 0755);