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

If command 'source' fails, don't move on with the script 

(and od nonsens simulations), but stop ngspice and await
detaching (shared ngspice), or wait for user input.
This commit is contained in:
Holger Vogt 2020-04-28 17:23:07 +02:00
parent 2d4549ad96
commit 8ea51cc2f3
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/frontend/inp.c
View File

@ -1578,16 +1578,29 @@ com_source(wordlist *wl)
tempfile = smktemp("sp");
if ((fp = inp_pathopen(tempfile, "w+")) == NULL) {
perror(tempfile);
fprintf(cp_err, " Simulation interrupted due to error!\n\n");
cp_interactive = TRUE;
return;
/* If we cannot open the temporary file, stop all further command execution */
#ifdef SHARED_MODULE
controlled_exit(1);
#else
cp_evloop(NULL);
#endif
}
while (wl) {
if ((tp = inp_pathopen(wl->wl_word, "r")) == NULL) {
fprintf(cp_err, "Command 'source' failed:\n");
perror(wl->wl_word);
fprintf(cp_err, " Simulation interrupted due to error!\n\n");
fclose(fp);
cp_interactive = TRUE;
unlink(tempfile);
return;
/* If we cannot source the file, stop all further command execution */
#ifdef SHARED_MODULE
controlled_exit(1);
#else
cp_evloop(NULL);
#endif
}
while ((n = fread(buf, 1, BSIZE_SP, tp)) > 0)
fwrite(buf, 1, n, fp);
@ -1600,8 +1613,16 @@ com_source(wordlist *wl)
}
if (fp == NULL) {
fprintf(cp_err, "Command 'source' failed:\n");
perror(wl->wl_word);
fprintf(cp_err, " Simulation interrupted due to error!\n\n");
cp_interactive = TRUE;
/* If we cannot source the file, stop all further command execution */
#ifdef SHARED_MODULE
controlled_exit(1);
#else
cp_evloop(NULL);
#endif
return;
}