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

search for user's initialization files has been 

optimized away because of an empty if clause.
A simple rewrite firstly asks for .spiceinit, then for spice.rc
This commit is contained in:
Holger Vogt 2018-05-10 14:45:29 +02:00
parent d311fb10cf
commit 7363532d11
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/sharedspice.c
View File

@ -675,32 +675,38 @@ ngSpice_Init(SendChar* printfcn, SendStat* statusfcn, ControlledExit* ngspiceexi
tfree(s);
}
#else /* ~ HAVE_PWD_H */
/* 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) &&
FALSE == read_initialisation_file("", ALT_INITSTR)) {
/* if that failed try in the user's home directory
if their HOME environment variable is set */
char *homedir = getenv("HOME");
if (homedir) {
if (FALSE == read_initialisation_file(homedir, INITSTR) &&
FALSE == read_initialisation_file(homedir, ALT_INITSTR)) {
;
}
}
/* load user's initialisation file .spiceinit (or old spice.rc)
try accessing the initialisation file in the current directory,
or the user's home directories HOME (Linux) and USERPROFILE (MS Windows)*/
char *homedir;
bool userfileok = read_initialisation_file("", INITSTR); /*.spiceinit*/
if (!userfileok) {
homedir = getenv("HOME");
if (homedir)
userfileok = read_initialisation_file(homedir, 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)) {
;
}
userfileok = read_initialisation_file(homedir, INITSTR);
}
}
if (!userfileok)
userfileok = read_initialisation_file("", ALT_INITSTR); /*spice.rc*/
if (!userfileok) {
homedir = getenv("HOME");
if (homedir)
userfileok = read_initialisation_file(homedir, ALT_INITSTR);
else {
homedir = getenv("USERPROFILE");
if (homedir)
userfileok = read_initialisation_file(homedir, ALT_INITSTR);
}
}
if (!userfileok && ft_ngdebug)
fprintf(stdout, "Warning: No user initialization file .spiceinit or spice.rc found\n");
#endif /* ~ HAVE_PWD_H */
bot:
signal(SIGINT, old_sigint);