main.c, add USERPROFILE to search path for .spiceinit search sequence: current directory, HOME, USERPROFILE
This commit is contained in:
parent
fabcc8770a
commit
232ea80a57
16
src/main.c
16
src/main.c
|
|
@ -1138,16 +1138,26 @@ main(int argc, char **argv)
|
||||||
/* load user's initialisation file
|
/* load user's initialisation file
|
||||||
try accessing the initialisation file in the current directory
|
try accessing the initialisation file in the current directory
|
||||||
if that fails try the alternate name */
|
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)) {
|
FALSE == read_initialisation_file("", ALT_INITSTR)) {
|
||||||
/* if that failed try in the user's home directory
|
/* 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");
|
char *homedir = getenv("HOME");
|
||||||
if (homedir)
|
if (homedir) {
|
||||||
if (FALSE == read_initialisation_file(homedir, INITSTR) &&
|
if (FALSE == read_initialisation_file(homedir, INITSTR) &&
|
||||||
FALSE == read_initialisation_file(homedir, ALT_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)) {
|
||||||
|
;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue