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

Fixed merge conflict. Also made readifile() static and removed an unnecessary string duplication there.

This commit is contained in:
Jim Monte 2019-12-05 16:19:21 -05:00
parent aee1304ad4 dd05e24677
commit 0ad9565ba7
6 changed files with 99 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/frontend/com_set.c
View File

@ -6,6 +6,8 @@
#include "variable.h"
#include "com_set.h"
static wordlist* readifile(wordlist*);
/* The set command.
*
@ -35,7 +37,14 @@ void com_set(wordlist *wl)
return;
}
struct variable *oldvar;
/* Handle special case input redirection. The file contents is
* converted to a list that can be handled by cp_setparse(). */
{
const wordlist * const ww = wl->wl_next;
if (ww && eq(ww->wl_word, "<")) {
wl = readifile(wl);
}
}
struct variable *vars = cp_setparse(wl);
@ -62,7 +71,7 @@ void com_set(wordlist *wl)
s = NULL;
}
cp_vset(vars->va_name, vars->va_type, s);
oldvar = vars;
struct variable * const oldvar = vars;
vars = vars->va_next;
/* Free allocations associated with the current variable */
@ -73,4 +82,58 @@ void com_set(wordlist *wl)
/* don't free oldvar->va_list! This structure is used furthermore! */
txfree(oldvar);
}
} /* end of function com_set */
/* read a file from cp_in, add the tokens to a wordlist and
create an input for a string list like set ccc = ( 3 5 7 ).
Comment lines in input file (starting with '*') are ignored. */
static wordlist*
readifile(wordlist* win)
{
/* max file size */
char intoken[4096];
/* save start address */
wordlist* tw = win;
char *tmpstr;
/* delete wordlist from '<' on */
wl_free(win->wl_next);
wl_append_word(&win, &win, copy("="));
wl_append_word(&win, &win, copy("("));
/* read a line. If it starts with '*', ignore it */
while (fgets(intoken, sizeof intoken, cp_in) != NULL) {
if (intoken[0] == '*') { /* skip comment lines */
continue;
}
char *instr = intoken;
/* get all tokens, ignoring '\n'
and add to string list */
while ((tmpstr = gettok(&instr)) != NULL) {
wl_append_word(&win, &win, tmpstr);
}
}
wl_append_word(&win, &win, copy(")"));
/* close and reset cp_in
(was opened in streams.c:84) */
cp_ioreset();
return tw;
#if 0
size_t retval = fread(intoken, 1, 4096, cp_in);
intoken[retval] = '\0';
char* delstr;
char* instr = delstr = copy(intoken);
/* get all tokens, ignoring '\n'
and add to string list */
while ((tmpstr = gettok(&instr)) != NULL) {
wl_append_word(&win, &win, tmpstr);
}
tfree(delstr);
wl_append_word(&win, &win, copy(")"));
/* close and reset cp_in
(was opened in streams.c:84) */
cp_ioreset();
return tw;
#endif
}

12
src/frontend/streams.c
View File

@ -82,16 +82,20 @@ cp_redirect(wordlist *wl)
#endif
fp = fopen(fname, "r");
tfree(fname);
if (!fp) {
perror(fname);
tfree(fname);
goto error;
}
tfree(fname);
cp_in = fp;
wl_delete_slice(beg, w);
/* special case for set command:
keep i/o information (handled in com_set.c) */
wordlist* bw = beg->wl_prev->wl_prev;
if (!(bw && cieq(bw->wl_word, "set")))
wl_delete_slice(beg, w);
} else if (*w->wl_word == cp_gt) {

3
src/xspice/icm/table/mada/eno2.c
View File

@ -72,6 +72,9 @@ sf_eno2_close (sf_eno2 pnt)
{
int i2;
if (!pnt)
return;
sf_eno_close (pnt->jnt);
for (i2 = 0; i2 < pnt->n2; i2++)
sf_eno_close (pnt->ent[i2]);

3
src/xspice/icm/table/mada/eno3.c
View File

@ -78,6 +78,9 @@ sf_eno3_close(sf_eno3 pnt)
{
int i2, i3;
if (!pnt)
return;
sf_eno2_close (pnt->jnt);
for (i3 = 0; i3 < pnt->n3; i3++) {
for (i2 = 0; i2 < pnt->n2; i2++)

15
src/xspice/icm/table/table2D/cfunc.mod
View File

@ -298,6 +298,8 @@ cm_table2D_callback(ARGS, Mif_Callback_Reason_t reason)
case MIF_CB_DESTROY: {
int i;
Local_Data_t *loc = STATIC_VAR (locdata);
if (!loc)
break;
free(loc->state);
for (i = 0; i < loc->iy; i++)
free(loc->table[i]);
@ -306,6 +308,7 @@ cm_table2D_callback(ARGS, Mif_Callback_Reason_t reason)
free(loc->ycol);
sf_eno2_close (loc->newtable);
free(loc);
STATIC_VAR (locdata) = loc = NULL;
break;
}
}
@ -428,8 +431,9 @@ cm_table2D(ARGS) /* structure holding parms, inputs, outputs, etc. */
struct stat st;
if (!loc->state->fp || fstat(fileno(loc->state->fp), &st)) {
cm_message_printf("cannot open file %s", PARAM(file));
loc->state->atend = 1;
loc->init_err = 1;
free(loc->state);
free(loc);
STATIC_VAR (locdata) = loc = NULL;
return;
}
/* get file length */
@ -441,8 +445,9 @@ cm_table2D(ARGS) /* structure holding parms, inputs, outputs, etc. */
cThisLine = calloc(lFileLen + 1, sizeof(char));
if (cFile == NULL || cThisLine == NULL) {
cm_message_printf("Insufficient memory to read file %s", PARAM(file));
loc->state->atend = 1;
loc->init_err = 1;
free(loc->state);
free(loc);
STATIC_VAR (locdata) = loc = NULL;
if(cFile) free(cFile);
if(cThisLine) free(cThisLine);
return;
@ -627,7 +632,7 @@ cm_table2D(ARGS) /* structure holding parms, inputs, outputs, etc. */
loc = STATIC_VAR (locdata);
/* return immediately if there was an initialization error */
if (loc->init_err == 1)
if (!loc || loc->init_err == 1)
return;
/* get input x, y,

15
src/xspice/icm/table/table3D/cfunc.mod
View File

@ -304,6 +304,8 @@ cm_table3D_callback(ARGS, Mif_Callback_Reason_t reason)
case MIF_CB_DESTROY: {
int i, j;
Local_Data_t *loc = STATIC_VAR (locdata);
if (!loc)
break;
free(loc->state);
for (i = 0; i < loc->iz; i++) {
@ -317,6 +319,7 @@ cm_table3D_callback(ARGS, Mif_Callback_Reason_t reason)
free(loc->zcol);
sf_eno3_close (loc->newtable);
free(loc);
STATIC_VAR (locdata) = loc = NULL;
break;
}
}
@ -442,8 +445,9 @@ cm_table3D(ARGS) /* structure holding parms, inputs, outputs, etc. */
struct stat st;
if (!loc->state->fp || fstat(fileno(loc->state->fp), &st)) {
cm_message_printf("cannot open file %s", PARAM(file));
loc->state->atend = 1;
loc->init_err = 1;
free(loc->state);
free(loc);
STATIC_VAR (locdata) = loc = NULL;
return;
}
/* get file length */
@ -455,8 +459,9 @@ cm_table3D(ARGS) /* structure holding parms, inputs, outputs, etc. */
cThisLine = calloc(lFileLen + 1, sizeof(char));
if (cFile == NULL || cThisLine == NULL) {
cm_message_printf("Insufficient memory to read file %s", PARAM(file));
loc->state->atend = 1;
loc->init_err = 1;
free(loc->state);
free(loc);
STATIC_VAR (locdata) = loc = NULL;
if(cFile) free(cFile);
if(cThisLine) free(cThisLine);
return;
@ -668,7 +673,7 @@ cm_table3D(ARGS) /* structure holding parms, inputs, outputs, etc. */
loc = STATIC_VAR (locdata);
/* return immediately if there was an initialization error */
if (loc->init_err == 1)
if (!loc || loc->init_err == 1)
return;
/* get input x, y, z;