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

Corrected an issue with the last commit for fixing the "extresist" 

command for use with "extract path";  the cellname was being cleared
after generating the filename with the extract path, but was being
used afterward, so it needed to be reverted back to the original
value, not just free'd.  Otherwise "extresist" will fail to produce
any results.
This commit is contained in:
Tim Edwards 2023-08-07 15:37:04 -04:00
parent 22fbb28656
commit 13a7cc32e2
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.422 8.3.423

6
resis/ResReadSim.c
View File

@ -901,7 +901,8 @@ ResSimProcessDrivePoints(filename)
HashEntry *entry; HashEntry *entry;
ResSimNode *node; ResSimNode *node;
fp = PaOpen(filename, "r", ".ext", ".", (char *)NULL, (char **)NULL); fp = PaOpen(filename, "r", ".ext", (ExtLocalPath == NULL) ? "." : ExtLocalPath,
(char *)NULL, (char **)NULL);
if (fp == NULL) if (fp == NULL)
{ {
TxError("Cannot open file %s%s\n", filename, ".ext"); TxError("Cannot open file %s%s\n", filename, ".ext");
@ -947,7 +948,8 @@ ResSimProcessFixPoints(filename)
FILE *fp; FILE *fp;
ResFixPoint *thisfix; ResFixPoint *thisfix;
fp = PaOpen(filename, "r", ".ext", ".", (char *)NULL, (char **)NULL); fp = PaOpen(filename, "r", ".ext", (ExtLocalPath == NULL) ? "." : ExtLocalPath,
(char *)NULL, (char **)NULL);
if (fp == NULL) if (fp == NULL)
{ {
TxError("Cannot open file %s%s\n", filename, ".ext"); TxError("Cannot open file %s%s\n", filename, ".ext");

3
resis/ResRex.c
View File

@ -986,6 +986,7 @@ ResCheckSimNodes(celldef, resisdata)
} }
ResExtFile = PaOpen(outfile, "w", ".res.ext", ".", (char *)NULL, (char **)NULL); ResExtFile = PaOpen(outfile, "w", ".res.ext", ".", (char *)NULL, (char **)NULL);
if (outfile != celldef->cd_name) freeMagic(outfile); if (outfile != celldef->cd_name) freeMagic(outfile);
outfile = celldef->cd_name;
} }
else else
{ {
@ -1194,7 +1195,7 @@ ResCheckSimNodes(celldef, resisdata)
} }
else else
{ {
ResDoSimplify(ftolerance,rctol,&gparams); ResDoSimplify(ftolerance, rctol, &gparams);
if (ResOptionsFlags & ResOpt_DoLumpFile) if (ResOptionsFlags & ResOpt_DoLumpFile)
{ {
ResWriteLumpFile(node); ResWriteLumpFile(node);