Apple-2-Tools/nulib2
1
0
Fork 0
mirror of https://github.com/fadden/nulib2.git synced 2025-02-05 20:30:57 +00:00
Code Issues Projects Releases Wiki Activity

Reduced complaints when opening a non-NuFX archive file.

Browse Source
This commit is contained in:
Andy McFadden 2002-10-01 00:50:07 +00:00
parent 146a508606
commit df3b8cc850
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nufxlib-0/Archive.c
View File

@ -454,6 +454,11 @@ bail:
* This also handles skipping the first 128 bytes of a .BXY file and the * This also handles skipping the first 128 bytes of a .BXY file and the
* front part of a self-extracting GSHK archive. * front part of a self-extracting GSHK archive.
* *
* We try to provide helpful messages about things that aren't archives,
* but try to stay silent about files that are other types of archives.
* That way, if the application is trying a series of libraries to find
* one that will accept the file, we don't generate spurious complaints.
*
* On exit, the stream will be positioned just past the master header. * On exit, the stream will be positioned just past the master header.
*/ */
static NuError static NuError
@ -473,6 +478,7 @@ Nu_ReadMasterHeader(NuArchive* pArchive)
pArchive->headerOffset = 0; pArchive->headerOffset = 0;
Nu_ReadBytes(pArchive, fp, pHeader->mhNufileID, kNufileIDLen); Nu_ReadBytes(pArchive, fp, pHeader->mhNufileID, kNufileIDLen);
/* may have read fewer than kNufileIDLen; that's okay */
if (memcmp(pHeader->mhNufileID, kNuBinary2ID, sizeof(kNuBinary2ID)) == 0) if (memcmp(pHeader->mhNufileID, kNuBinary2ID, sizeof(kNuBinary2ID)) == 0)
{ {
@ -483,6 +489,7 @@ Nu_ReadMasterHeader(NuArchive* pArchive)
SEEK_CUR); SEEK_CUR);
if (err != kNuErrNone) { if (err != kNuErrNone) {
err = kNuErrNotNuFX; err = kNuErrNotNuFX;
/* probably too short to be BNY, so go ahead and whine */
Nu_ReportError(NU_BLOB, kNuErrNone, Nu_ReportError(NU_BLOB, kNuErrNone,
"Might be Binary II, but it's not NuFX"); "Might be Binary II, but it's not NuFX");
goto bail; goto bail;
@ -496,8 +503,9 @@ Nu_ReadMasterHeader(NuArchive* pArchive)
count = Nu_ReadOne(pArchive, fp); count = Nu_ReadOne(pArchive, fp);
if (count != 0) { if (count != 0) {
err = kNuErrNotNuFX; err = kNuErrNotNuFX;
Nu_ReportError(NU_BLOB, kNuErrNone, /*Nu_ReportError(NU_BLOB, kNuErrNone,
"This is a Binary II archive with %d files in it", count+1); "This is a Binary II archive with %d files in it", count+1);*/
DBUG(("This is a Binary II archive with %d files in it\n",count+1));
goto bail; goto bail;
} }
@ -528,10 +536,11 @@ Nu_ReadMasterHeader(NuArchive* pArchive)
if (memcmp(kNuMasterID, pHeader->mhNufileID, kNufileIDLen) != 0) { if (memcmp(kNuMasterID, pHeader->mhNufileID, kNufileIDLen) != 0) {
err = kNuErrNotNuFX; err = kNuErrNotNuFX;
if (isBinary2) if (isBinary2) {
Nu_ReportError(NU_BLOB, kNuErrNone, /*Nu_ReportError(NU_BLOB, kNuErrNone,
"Looks like Binary II, not NuFX"); "Looks like Binary II, not NuFX");*/
else if (isSea) DBUG(("Looks like Binary II, not NuFX\n"));
} else if (isSea)
Nu_ReportError(NU_BLOB, kNuErrNone, Nu_ReportError(NU_BLOB, kNuErrNone,
"Looks like GS executable, not NuFX"); "Looks like GS executable, not NuFX");
else if (Nu_HeaderIOFailed(pArchive, fp) != kNuErrNone) else if (Nu_HeaderIOFailed(pArchive, fp) != kNuErrNone)