luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

read_line() function improvements, "]" tag recognized also if there is garbage following it

This commit is contained in:
Stefan Schippers 2020-09-28 08:35:00 +02:00
parent 59d4608ac0
commit ebdd4e827c
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/callback.c
View File

@ -245,7 +245,6 @@ int callback(int event, int mx, int my, KeySym key,
if(vertical_move) mousex_snap = mx_double_save;
new_polygon(RUBBER); /* 20171115 */
}
if(!(ui_state & STARTPOLYGON) && (state&Button1Mask) && !(ui_state & STARTWIRE) && !(ui_state & STARTPAN2) &&
!(state & Mod1Mask) && !(state & ShiftMask) && !(ui_state & PLACE_SYMBOL)) /* start of a mouse area selection */
{
@ -264,7 +263,6 @@ int callback(int event, int mx, int my, KeySym key,
}
}
}
if((state & Button1Mask) && (state & Mod1Mask) && !(state & ShiftMask) &&
!(ui_state & STARTPAN2) && !(ui_state & PLACE_SYMBOL)) { /* 20150927 unselect area */
if( !(ui_state & STARTSELECT)) {

12
src/save.c
View File

@ -61,7 +61,8 @@ void read_record(int firstchar, FILE *fp, int dbg_level)
/* skip line of text from file, stopping before '\n' or EOF */
char *read_line(FILE *fp, int dbg_level)
{
static char s[300];
char s[300];
static char ret[300];
int first = 0;
s[0] = '\0';
@ -69,12 +70,13 @@ char *read_line(FILE *fp, int dbg_level)
if(!s[0]) break;
if(!first) {
dbg(dbg_level, "\n-----2- SKIPPING -------\n|");
my_strncpy(ret, s, S(ret)); /* store beginning of line for return */
first = 1;
}
dbg(dbg_level, "%s", s);
}
if(first) dbg(dbg_level, "|\n------------------------\n");
return s[0] ? s : NULL;
return s[0] ? ret : NULL;
}
/* */
@ -822,7 +824,7 @@ void read_xschem_file(FILE *fd)
if(!str) {
break;
}
if(!strcmp(str, "]")) break;
if(!strncmp(str, "]", 1)) break;
fscanf(fd, "\n");
}
}
@ -1758,7 +1760,6 @@ int load_sym_def(const char *name, FILE *embed_fd)
aa[c][i].fill =1;
else
aa[c][i].fill =0;
dash = get_tok_value(aa[c][i].prop_ptr,"dash", 0);
if( strcmp(dash, "") ) {
int d = atoi(dash);
@ -1920,7 +1921,6 @@ int load_sym_def(const char *name, FILE *embed_fd)
fprintf(errfp, "l_s_d(): unable to open file to read schematic: %s\n", sympath);
} else {
if (level+1 >= max_level) {
my_realloc(653, &lcc, (max_level + 1) * sizeof(struct Lcc));
max_level++;
}
@ -1961,7 +1961,7 @@ int load_sym_def(const char *name, FILE *embed_fd)
if(!skip_line) {
break;
}
if(!strcmp(skip_line, "]")) break;
if(!strncmp(skip_line, "]", 1)) break;
fscanf(lcc[level].fd, "\n");
}
break;