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

fix bug in subst_tok() ( subst_tok(NULL, "tok", "val") --> NULL instead of "tok=val")

This commit is contained in:
Stefan Schippers 2020-08-21 10:50:27 +02:00
parent b842e020bc
commit fea391fcfd
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/token.c
View File

@ -774,18 +774,19 @@ char *subst_token(const char *s, const char *tok, const char *new_val)
int done_subst=0;
int escape=0, matched_tok=0;
if(s==NULL){
if(s==NULL && tok == NULL){
my_free(989, &result);
return "";
}
if(tok == NULL || tok[0]=='\0'){
my_strdup(458, &result, s);
if((tok == NULL || tok[0]=='\0') && s ){
my_strdup2(458, &result, s);
return result;
}
dbg(1, "subst_token(%s, %s, %s)\n", s, tok, new_val);
sizetok = size = CADCHUNKALLOC;
my_realloc(1152, &result, size);
my_realloc(1153, &token, sizetok);
result[0] = '\0';
while( s ) {
c=*s++;
space=SPACE(c);
@ -905,14 +906,15 @@ char *subst_token(const char *s, const char *tok, const char *new_val)
if(c == '\0') break;
}
if(!done_subst) { /* if tok not found add tok=new_value at end */
if(result_pos == 0 ) result_pos = 1; /* result="" */
if(new_val) {
if(!new_val[0]) new_val = "\"\"";
tmp = strlen(new_val) + strlen(tok) + 2;
if(result_pos + tmp >= size) {
if(result_pos + tmp >= size) {
size = (1 + (result_pos + tmp) / CADCHUNKALLOC) * CADCHUNKALLOC;
my_realloc(460, &result,size);
}
my_snprintf(result + result_pos - 1, size, " %s=%s", tok, new_val );
my_snprintf(result + result_pos - 1, size, " %s=%s", tok, new_val ); /* result_pos guaranteed to be > 0 */
}
}
dbg(2, "subst_token(): returning: %s\n",result);