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

Pull in recent nufxlib changes

Browse Source 
Update to v3.1.0-a2.
This commit is contained in:
Andy McFadden 2016-01-11 10:30:08 -08:00
parent ebef6a27c2
commit 6153b0f9a1
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nufxlib/ChangeLog.txt
View File

@ -1,3 +1,6 @@
2016/01/11 fadden
- Fix handling of disk images (broken by previous change).
2015/12/26 fadden 2015/12/26 fadden
- Fix handling of entries with missing threads. - Fix handling of entries with missing threads.
- Improve handling of Mac OS X file type attributes. - Improve handling of Mac OS X file type attributes.

6
nufxlib/Record.c
View File

@ -1586,6 +1586,9 @@ NuError Nu_StreamExtract(NuArchive* pArchive)
needFakeData = false; needFakeData = false;
} else if (pThread->thThreadKind == kNuThreadKindRsrcFork) { } else if (pThread->thThreadKind == kNuThreadKindRsrcFork) {
needFakeRsrc = false; needFakeRsrc = false;
} else if (pThread->thThreadKind == kNuThreadKindDiskImage) {
/* needFakeRsrc shouldn't be set, but clear anyway */
needFakeData = needFakeRsrc = false;
} }
err = Nu_ExtractThreadBulk(pArchive, &tmpRecord, pThread); err = Nu_ExtractThreadBulk(pArchive, &tmpRecord, pThread);
if (err == kNuErrSkipped) { if (err == kNuErrSkipped) {
@ -1723,6 +1726,9 @@ static NuError Nu_ExtractRecordByPtr(NuArchive* pArchive, NuRecord* pRecord)
needFakeData = false; needFakeData = false;
} else if (pThread->thThreadKind == kNuThreadKindRsrcFork) { } else if (pThread->thThreadKind == kNuThreadKindRsrcFork) {
needFakeRsrc = false; needFakeRsrc = false;
} else if (pThread->thThreadKind == kNuThreadKindDiskImage) {
/* needFakeRsrc shouldn't be set, but clear anyway */
needFakeData = needFakeRsrc = false;
} }
err = Nu_ExtractThreadBulk(pArchive, pRecord, pThread); err = Nu_ExtractThreadBulk(pArchive, pRecord, pThread);
if (err == kNuErrSkipped) { if (err == kNuErrSkipped) {

3
nufxlib/Thread.c
View File

@ -223,6 +223,9 @@ NuError Nu_ReadThreadHeaders(NuArchive* pArchive, NuRecord* pRecord,
needFakeData = false; needFakeData = false;
} else if (pThread->thThreadKind == kNuThreadKindRsrcFork) { } else if (pThread->thThreadKind == kNuThreadKindRsrcFork) {
needFakeRsrc = false; needFakeRsrc = false;
} else if (pThread->thThreadKind == kNuThreadKindDiskImage) {
/* needFakeRsrc shouldn't be set, but clear anyway */
needFakeData = needFakeRsrc = false;
} }
} }