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

Enable the file input as search path for .include files 

also for non-Wondows OSs
This commit is contained in:
Holger Vogt 2019-09-03 10:52:30 +02:00
parent 9543a5644c
commit 1c8992bf15
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.c
View File

@ -1179,9 +1179,9 @@ main(int argc, char **argv)
startup time. */ startup time. */
FILE *tempfile = tmpfile(); FILE *tempfile = tmpfile();
char *dname = NULL; /* input file*/
#if defined(HAS_WINGUI) || defined(_MSC_VER) || defined(__MINGW32__) #if defined(HAS_WINGUI) || defined(_MSC_VER) || defined(__MINGW32__)
char *dname = NULL; /* input file*/
char *tpf = NULL; /* temporary file */ char *tpf = NULL; /* temporary file */
/* tmpfile() returns NULL, if in MS Windows as non admin user /* tmpfile() returns NULL, if in MS Windows as non admin user
@ -1234,11 +1234,9 @@ main(int argc, char **argv)
} }
} }
#if defined(HAS_WINGUI) || defined(_MSC_VER) || defined(__MINGW32__)
/* Copy the input file name which otherwise will be lost due to the /* Copy the input file name which otherwise will be lost due to the
temporary file */ temporary file */
dname = copy(arg); dname = copy(arg);
#endif
#if defined(HAS_WINGUI) #if defined(HAS_WINGUI)
/* write source file name into source window */ /* write source file name into source window */
SetSource(dname); SetSource(dname);
@ -1253,13 +1251,9 @@ main(int argc, char **argv)
fseek(tempfile, 0L, SEEK_SET); fseek(tempfile, 0L, SEEK_SET);
if (tempfile && (!err || !ft_batchmode)) { if (tempfile && (!err || !ft_batchmode)) {
#if defined(HAS_WINGUI) || defined(_MSC_VER) || defined(__MINGW32__) /* Copy the input file name for becoming another file search path */
/* Copy the input file name for adding another file search path */
inp_spsource(tempfile, FALSE, dname, FALSE); inp_spsource(tempfile, FALSE, dname, FALSE);
tfree(dname); tfree(dname);
#else
inp_spsource(tempfile, FALSE, NULL, FALSE);
#endif
gotone = TRUE; gotone = TRUE;
} }