main.c, add USERPROFILE to search path for .spiceinit

search sequence: current directory, HOME, USERPROFILE
This commit is contained in:
h_vogt 2016-10-30 00:52:04 +02:00 committed by rlar
parent c981893873
commit 064b2f790c
1 changed files with 14 additions and 4 deletions

View File

@ -1138,16 +1138,26 @@ main(int argc, char **argv)
/* load user's initialisation file
try accessing the initialisation file in the current directory
if that fails try the alternate name */
if (FALSE == read_initialisation_file("", INITSTR) &&
if (FALSE == read_initialisation_file("", INITSTR) &&
FALSE == read_initialisation_file("", ALT_INITSTR)) {
/* if that failed try in the user's home directory
if their HOME environment variable is set */
if their HOME environment variable is set */
char *homedir = getenv("HOME");
if (homedir)
if (FALSE == read_initialisation_file(homedir, INITSTR) &&
if (homedir) {
if (FALSE == read_initialisation_file(homedir, INITSTR) &&
FALSE == read_initialisation_file(homedir, ALT_INITSTR)) {
;
}
}
else {
/* If there is no HOME environment (e.g. MS Windows), try user's profile directory */
homedir = getenv("USERPROFILE");
if (homedir)
if (FALSE == read_initialisation_file(homedir, INITSTR) &&
FALSE == read_initialisation_file(homedir, ALT_INITSTR)) {
;
}
}
}
}