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

Corrected .mag file read-in so that it will not complain about 

a layout being redefined if one records the full path name and
the other records the home directory tilde expression.
This commit is contained in:
Tim Edwards 2019-12-14 18:30:48 -05:00
parent fd737dbf80
commit be38dac9fb
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
database/DBio.c
View File

@ -1440,9 +1440,22 @@ badTransform:
slashptr = strrchr(subCellDef->cd_file, '/'); slashptr = strrchr(subCellDef->cd_file, '/');
if (slashptr != NULL) if (slashptr != NULL)
{ {
bool pathOK = FALSE;
*slashptr = '\0'; *slashptr = '\0';
if (strcmp(subCellDef->cd_file, pathptr)) /* Avoid generating error message if pathptr starts with '~' */
/* and the tilde-expanded name matches the subCellDef name */
if (*pathptr == '~')
{
char *homedir = getenv("HOME");
if (!strncmp(subCellDef->cd_file, homedir, strlen(homedir))
&& (!strcmp(subCellDef->cd_file + strlen(homedir),
pathptr + 1)))
pathOK = TRUE;
}
if ((pathOK == FALSE) && strcmp(subCellDef->cd_file, pathptr))
{ {
TxError("Duplicate cell in %s: Instance of cell %s is from " TxError("Duplicate cell in %s: Instance of cell %s is from "
"path %s but cell was previously read from %s.\n", "path %s but cell was previously read from %s.\n",