luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified search for init file so that it searches both <HOME> and <USERPROFILE> if both are defined.

This commit is contained in:
Jim Monte 2019-12-17 01:44:36 -05:00
parent 9507c00d61
commit 3ddc4b986a
1 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/main.c
View File

@ -1143,24 +1143,39 @@ int 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) && do {
FALSE == read_initialisation_file("", ALT_INITSTR)) { if (read_initialisation_file("", INITSTR) != FALSE) {
/* if that failed try in the user's home directory break;
if their HOME environment variable is set */ }
char *homedir = getenv("HOME"); if (read_initialisation_file("", ALT_INITSTR) != FALSE) {
if (homedir == (char *) NULL) { /* no HOME env variable */ break;
/* If there is no HOME environment (e.g. MS Windows),
* try user's profile directory */
homedir = getenv("USERPROFILE");
} }
if (homedir) { /* Found a home location */ {
if (FALSE == read_initialisation_file(homedir, INITSTR)) { const char * const home = getenv("HOME");
(void) read_initialisation_file(homedir, ALT_INITSTR); if (home) {
if (read_initialisation_file(home, INITSTR) != FALSE) {
break;
}
if (read_initialisation_file(home, ALT_INITSTR) != FALSE) {
break;
}
} }
} }
} /* end of case init file not found in current directory */
} /* end of case that init file is to be read */ {
const char * const usr = getenv("USERPROFILE");
if (usr) {
if (read_initialisation_file(usr, INITSTR) != FALSE) {
break;
}
if (read_initialisation_file(usr, ALT_INITSTR) != FALSE) {
break;
}
}
}
} while (0);
} /* end of case that init file is read */
if (!ft_batchmode) { if (!ft_batchmode) {
com_version(NULL); com_version(NULL);