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

Merge branch 'work' into tomerge

This commit is contained in:
Tim Edwards 2018-04-24 09:31:06 -04:00
parent d5ffa9eabe c522acab33
commit 33a70706ac
2 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calma/CalmaWrite.c
View File

@ -681,12 +681,12 @@ calmaProcessDef(def, outf)
/* another vendor GDS, it would not normally be output. */ /* another vendor GDS, it would not normally be output. */
DBPropGet(def->cd_parents->cu_parent, "GDS_FILE", &isReadOnly); DBPropGet(def->cd_parents->cu_parent, "GDS_FILE", &isReadOnly);
if (!isReadOnly) if (!isReadOnly || isAbstract)
TxError("Calma output error: Can't find GDS file \"%s\" " TxError("Calma output error: Can't find GDS file \"%s\" "
"for vendor cell \"%s\". Using magic's " "for vendor cell \"%s\". Using magic's "
"internal definition\n", filename, "internal definition\n", filename,
def->cd_name); def->cd_name);
else if (isReadOnly)
def->cd_flags |= CDVENDORGDS; def->cd_flags |= CDVENDORGDS;
} }
else if (isAbstract) else if (isAbstract)

5
database/DBio.c
View File

@ -1400,6 +1400,8 @@ badTransform:
/* now two versions of the same cell name coming from different */ /* now two versions of the same cell name coming from different */
/* sources, and this must be corrected. */ /* sources, and this must be corrected. */
if (*pathptr != '\0')
{
if (subCellDef->cd_file != NULL) if (subCellDef->cd_file != NULL)
{ {
slashptr = strrchr(subCellDef->cd_file, '/'); slashptr = strrchr(subCellDef->cd_file, '/');
@ -1425,7 +1427,7 @@ badTransform:
*slashptr = '/'; *slashptr = '/';
} }
} }
else if (*pathptr != '\0') else
{ {
/* Reconstruct file from path and cellname */ /* Reconstruct file from path and cellname */
@ -1434,6 +1436,7 @@ badTransform:
strcat(path, DBSuffix); strcat(path, DBSuffix);
StrDup(&subCellDef->cd_file, path); StrDup(&subCellDef->cd_file, path);
} }
}
subCellUse = DBCellNewUse(subCellDef, (useid[0]) ? subCellUse = DBCellNewUse(subCellDef, (useid[0]) ?
((locked) ? useid + 1 : useid) : (char *) NULL); ((locked) ? useid + 1 : useid) : (char *) NULL);