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

Added a fallback method to file reading so as to not create havoc 

from the rigorous method of versioning in case files are relocated
and the use paths are no longer valid.  Cells are then searched
for in the search paths in the traditional manner, albeit with a
stern warning.  This should avoid most backwards-compatbility
issues.
This commit is contained in:
Tim Edwards 2018-04-16 21:43:35 -04:00
parent 2e9451ea19
commit e991e2cfc7
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
database/DBio.c
View File

@ -1025,6 +1025,24 @@ dbReadOpen(cellDef, name, setFileName, errptr)
f = PaLockOpen(cellDef->cd_file, "r", DBSuffix, ".",
(char *) NULL, &filename, &is_locked);
/* Fall back on the original method of using search paths. */
if (f == NULL)
{
f = PaLockOpen(cellDef->cd_name, "r", DBSuffix, Path,
CellLibPath, &filename, &is_locked);
if (f != NULL)
{
TxError("Warning: Parent cell of %s marked file location as %s.\n",
cellDef->cd_name, cellDef->cd_file);
TxError("Cell could not be found in that location. However,"
" the cell was found in\n");
TxError("the search paths at %s.\n", filename);
TxError("Please make sure that this is the intended cell version.\n");
}
}
if (errptr != NULL) *errptr = errno;
if (pptr != NULL) *pptr = '.'; // Put it back where you found it!
}