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

Added code to handle the case where GDS_FILE points to a filename 

that has since been compressed and given a ".gz" extension.
Removed code that uses a system call to "gunzip" and "gzip" when
the target file is compressed, since the compression is handled
in the code.
This commit is contained in:
Tim Edwards 2025-02-12 16:28:43 -05:00
parent 38b3d53b5f
commit df84a36659
3 changed files with 13 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.518 8.3.519

52
calma/CalmaWrite.c
View File

@ -971,45 +971,20 @@ calmaProcessDef(
off_t cellstart, cellend, structstart; off_t cellstart, cellend, structstart;
dlong cval; dlong cval;
int namelen; int namelen;
char *modName;
FILETYPE fi; FILETYPE fi;
/* Give some feedback to the user */ /* Give some feedback to the user */
TxPrintf(" Copying output for cell %s from %s\n", def->cd_name, filename); TxPrintf(" Copying output for cell %s from %s\n", def->cd_name, filename);
/* Handle compressed files */
modName = filename;
namelen = strlen(filename);
if ((namelen > 4) && !strcmp(filename + namelen - 3, ".gz"))
{
char *sysCmd, *sptr;
sptr = strrchr(filename, '/');
if (sptr == NULL)
sptr = filename;
else
sptr++;
modName = StrDup((char **)NULL, sptr);
*(modName + strlen(modName) - 3) = '\0';
sysCmd = mallocMagic(18 + namelen + strlen(modName));
sprintf(sysCmd, "gunzip -c %s > %s", filename, modName);
if (system(sysCmd) != 0)
{
/* File didn't uncompress. Go back to original name,
* although that will probably fail and raise an error.
*/
freeMagic(modName);
modName = filename;
}
}
/* Use PaZOpen() so the paths searched are the same as were */ /* Use PaZOpen() so the paths searched are the same as were */
/* searched to find the .mag file that indicated this GDS file. */ /* searched to find the .mag file that indicated this GDS file. */
fi = PaZOpen(modName, "r", "", Path, CellLibPath, &retfilename); fi = PaZOpen(filename, "r", "", Path, CellLibPath, &retfilename);
/* Check if file may have been compressed */
if (fi == NULL)
fi = PaZOpen(filename, "r", ".gz", Path, CellLibPath, &retfilename);
if (fi == NULL) if (fi == NULL)
{ {
/* This is a rare error, but if the subcell is inside */ /* This is a rare error, but if the subcell is inside */
@ -1025,9 +1000,7 @@ calmaProcessDef(
TxError("Calma output error: Can't find GDS file \"%s\" " TxError("Calma output error: Can't find GDS file \"%s\" "
"for vendor cell \"%s\". It will not be output.\n", "for vendor cell \"%s\". It will not be output.\n",
modName, def->cd_name); filename, def->cd_name);
if (modName != filename) freeMagic(modName);
if (CalmaAllowUndefined) if (CalmaAllowUndefined)
return 0; return 0;
@ -1175,17 +1148,6 @@ calmaProcessDef(
} }
FCLOSE(fi); FCLOSE(fi);
if (modName != filename)
{
/* Remove the uncompressed file */
if (unlink(modName) != 0)
{
TxError("Error attempting to delete uncompressed file \"%s\"\n",
modName);
}
freeMagic(modName);
}
/* Mark the definition as vendor GDS so that magic doesn't */ /* Mark the definition as vendor GDS so that magic doesn't */
/* try to generate subcell interaction or array interaction */ /* try to generate subcell interaction or array interaction */
/* paint for it. */ /* paint for it. */

5
calma/CalmaWriteZ.c
View File

@ -933,6 +933,11 @@ calmaProcessDefZ(
/* searched to find the .mag file that indicated this GDS file. */ /* searched to find the .mag file that indicated this GDS file. */
fi = PaZOpen(filename, "r", "", Path, CellLibPath, &retfilename); fi = PaZOpen(filename, "r", "", Path, CellLibPath, &retfilename);
/* Check if file may have been compressed */
if (fi == NULL)
fi = PaZOpen(filename, "r", ".gz", Path, CellLibPath, &retfilename);
if (fi == NULL) if (fi == NULL)
{ {
/* This is a rare error, but if the subcell is inside */ /* This is a rare error, but if the subcell is inside */