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

remove a bug in inc. handling

This commit is contained in:
h_vogt 2011-12-30 17:06:10 +00:00
parent c7ddee5923
commit 6382f60644
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
2011-12-30 Holger Vogt
* inpcom.c: remove a bug reading a file
(FIXME: .inc and .lib need some general overhauling!)
2011-12-30 Robert Larice 2011-12-30 Robert Larice
* src/include/ngspice/cktdefs.h , * src/include/ngspice/cktdefs.h ,
* src/include/ngspice/pzdefs.h , * src/include/ngspice/pzdefs.h ,
@ -7,7 +11,7 @@
* src/spicelib/devices/numos/numosdef.h : * src/spicelib/devices/numos/numosdef.h :
remove CVS `Id',`log' etc. keyword incantations remove CVS `Id',`log' etc. keyword incantations
2011-12-29 Holger Vogt 2011-12-30 Holger Vogt
* inppas3.c, cktdest.c: reduce memory leaks * inppas3.c, cktdest.c: reduce memory leaks
* inpsymt.c: beautify * inpsymt.c: beautify
* inp.c: .csparam allows to tranfer a param into a vector * inp.c: .csparam allows to tranfer a param into a vector

28
src/frontend/inpcom.c
View File

@ -251,6 +251,7 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name, bool c
/* now handle .lib statements */ /* now handle .lib statements */
if (ciprefix(".lib", buffer)) { if (ciprefix(".lib", buffer)) {
inp_stripcomments_line(buffer);
for ( s = buffer; *s && !isspace(*s); s++ ) /* skip over .lib */ for ( s = buffer; *s && !isspace(*s); s++ ) /* skip over .lib */
; ;
while ( isspace(*s) || isquote(*s) ) s++; /* advance past space chars */ while ( isspace(*s) || isquote(*s) ) s++; /* advance past space chars */
@ -299,10 +300,10 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name, bool c
if ((newfp = inp_pathopen( s, "r" )) == NULL) { if ((newfp = inp_pathopen( s, "r" )) == NULL) {
dir_name_flag = TRUE; dir_name_flag = TRUE;
if ((newfp = inp_pathopen( big_buff2, "r" )) == NULL ) { if ((newfp = inp_pathopen( big_buff2, "r" )) == NULL ) {
perror(s);
if(copys) tfree(copys); /* allocated by the cp_tildexpand() above */ if(copys) tfree(copys); /* allocated by the cp_tildexpand() above */
tfree(buffer); /* allocated by readline() above */ fprintf(cp_err, "Error: Could not find library file %s\n", s);
continue; tfree(buffer);
controlled_exit(EXIT_FAILURE);
} }
} }
if(copys) tfree(copys); /* allocated by the cp_tildexpand() above */ if(copys) tfree(copys); /* allocated by the cp_tildexpand() above */
@ -333,20 +334,27 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name, bool c
/* now handle .include statements */ /* now handle .include statements */
if (ciprefix(".include", buffer) || ciprefix(".inc", buffer)) { if (ciprefix(".include", buffer) || ciprefix(".inc", buffer)) {
inp_stripcomments_line(buffer);
for (s = buffer; *s && !isspace(*s); s++) /* advance past non-space chars */ for (s = buffer; *s && !isspace(*s); s++) /* advance past non-space chars */
; ;
while (isspace(*s) || isquote(*s)) /* now advance past space chars */ while (isspace(*s)) /* now advance past space chars */
s++; s++;
if (!*s) { /* if at end of line, error */
if(isquote(*s)) {
for (t = ++s; *t && !isquote(*t); t++)
;
if(!*t) /* teriminator quote not found */
t = s;
} else {
for (t = s; *t && !isspace(*t); t++)
;
}
if(t == s) {
fprintf(cp_err, "Error: .include filename missing\n"); fprintf(cp_err, "Error: .include filename missing\n");
tfree(buffer); /* was allocated by readline() */ tfree(buffer); /* was allocated by readline() */
controlled_exit(EXIT_FAILURE); controlled_exit(EXIT_FAILURE);
} }
/* Now s points to first char after .include */
inp_stripcomments_line(s);
/* stop at trailing \n\r or quote */
for (t = s; *t && !(*t=='\n') && !(*t=='\r') && !isquote(*t); t++)
;
*t = '\0'; /* place \0 and end of file name in buffer */ *t = '\0'; /* place \0 and end of file name in buffer */