From 6153b0f9a1b2ddc5802ba00d8f9d7e6b592e4083 Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Mon, 11 Jan 2016 10:30:08 -0800 Subject: [PATCH] Pull in recent nufxlib changes Update to v3.1.0-a2. --- nufxlib/ChangeLog.txt | 3 +++ nufxlib/Record.c | 6 ++++++ nufxlib/Thread.c | 3 +++ 3 files changed, 12 insertions(+) diff --git a/nufxlib/ChangeLog.txt b/nufxlib/ChangeLog.txt index e84eaed..9ca2f6d 100644 --- a/nufxlib/ChangeLog.txt +++ b/nufxlib/ChangeLog.txt @@ -1,3 +1,6 @@ +2016/01/11 fadden + - Fix handling of disk images (broken by previous change). + 2015/12/26 fadden - Fix handling of entries with missing threads. - Improve handling of Mac OS X file type attributes. diff --git a/nufxlib/Record.c b/nufxlib/Record.c index 858cf4d..6c85684 100644 --- a/nufxlib/Record.c +++ b/nufxlib/Record.c @@ -1586,6 +1586,9 @@ NuError Nu_StreamExtract(NuArchive* pArchive) needFakeData = false; } else if (pThread->thThreadKind == kNuThreadKindRsrcFork) { needFakeRsrc = false; + } else if (pThread->thThreadKind == kNuThreadKindDiskImage) { + /* needFakeRsrc shouldn't be set, but clear anyway */ + needFakeData = needFakeRsrc = false; } err = Nu_ExtractThreadBulk(pArchive, &tmpRecord, pThread); if (err == kNuErrSkipped) { @@ -1723,6 +1726,9 @@ static NuError Nu_ExtractRecordByPtr(NuArchive* pArchive, NuRecord* pRecord) needFakeData = false; } else if (pThread->thThreadKind == kNuThreadKindRsrcFork) { needFakeRsrc = false; + } else if (pThread->thThreadKind == kNuThreadKindDiskImage) { + /* needFakeRsrc shouldn't be set, but clear anyway */ + needFakeData = needFakeRsrc = false; } err = Nu_ExtractThreadBulk(pArchive, pRecord, pThread); if (err == kNuErrSkipped) { diff --git a/nufxlib/Thread.c b/nufxlib/Thread.c index 0ad4ba0..6480bfd 100644 --- a/nufxlib/Thread.c +++ b/nufxlib/Thread.c @@ -223,6 +223,9 @@ NuError Nu_ReadThreadHeaders(NuArchive* pArchive, NuRecord* pRecord, needFakeData = false; } else if (pThread->thThreadKind == kNuThreadKindRsrcFork) { needFakeRsrc = false; + } else if (pThread->thThreadKind == kNuThreadKindDiskImage) { + /* needFakeRsrc shouldn't be set, but clear anyway */ + needFakeData = needFakeRsrc = false; } }