Apple-2-Tools
/
profuse
mirror of https://github.com/ksherlock/profuse.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

git-svn-id: https://profuse.googlecode.com/svn/branches/v2@390 aa027e90-d47c-11dd-86d7-074df07e0730

This commit is contained in:
ksherlock 2011-03-14 23:15:37 +00:00
parent b4db3e59ab
commit 8778d0dcf2
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Device/SDKImage.cpp
View File

@ -22,6 +22,7 @@
#include <Common/Exception.h> #include <Common/Exception.h>
#include <NuFX/Exception.h> #include <NuFX/Exception.h>
#include <POSIX/Exception.h>
using namespace Device; using namespace Device;
@ -45,7 +46,7 @@ static record_thread FindDiskImageThread(NuArchive *archive)
e = NuGetAttr(archive, kNuAttrNumRecords, &recordCount); e = NuGetAttr(archive, kNuAttrNumRecords, &recordCount);
if (e) if (e)
{ {
throw NuFXException(__METHOD__ ": NuGetAttr", e); throw NuFX::Exception(__METHOD__ ": NuGetAttr", e);
} }
for (unsigned position = 0; position < recordCount; ++position) for (unsigned position = 0; position < recordCount; ++position)
@ -56,13 +57,13 @@ static record_thread FindDiskImageThread(NuArchive *archive)
e = NuGetRecordIdxByPosition(archive, position, &rIndex); e = NuGetRecordIdxByPosition(archive, position, &rIndex);
if (e) if (e)
{ {
throw NuFXException(__METHOD__ ": NuGetRecordIdxByPosition", e); throw NuFX::Exception(__METHOD__ ": NuGetRecordIdxByPosition", e);
} }
e = NuGetRecord(archive, rIndex, &record); e = NuGetRecord(archive, rIndex, &record);
if (e) if (e)
{ {
throw NuFXException(__METHOD__ ": NuGetRecord", e); throw NuFX::Exception(__METHOD__ ": NuGetRecord", e);
} }
for (unsigned i = 0; i < NuRecordGetNumThreads(record); ++i) for (unsigned i = 0; i < NuRecordGetNumThreads(record); ++i)
@ -78,7 +79,7 @@ static record_thread FindDiskImageThread(NuArchive *archive)
} }
} }
throw Exception(__METHOD__ ": not a disk image"); throw ::Exception(__METHOD__ ": not a disk image");
} }
@ -116,7 +117,7 @@ BlockDevicePointer SDKImage::Open(const char *name)
e = NuOpenRO(name, &archive); e = NuOpenRO(name, &archive);
if (e) if (e)
{ {
throw NuFXException(__METHOD__ ": NuOpenRO", e); throw NuFX::Exception(__METHOD__ ": NuOpenRO", e);
} }
rt = FindDiskImageThread(archive); rt = FindDiskImageThread(archive);
@ -124,27 +125,27 @@ BlockDevicePointer SDKImage::Open(const char *name)
fd = mkstemp(tmp); fd = mkstemp(tmp);
if (fd < 0) if (fd < 0)
{ {
throw POSIXException(__METHOD__ ": mkstemp", errno); throw POSIX::Exception(__METHOD__ ": mkstemp", errno);
} }
fp = fdopen(fd, "w"); fp = fdopen(fd, "w");
if (!fp) if (!fp)
{ {
::close(fd); ::close(fd);
throw POSIXException(__METHOD__ ": fdopen", errno); throw POSIX::Exception(__METHOD__ ": fdopen", errno);
} }
e = NuCreateDataSinkForFP(true, kNuConvertOff, fp, &sink); e = NuCreateDataSinkForFP(true, kNuConvertOff, fp, &sink);
if (e) if (e)
{ {
throw NuFXException(__METHOD__ ": NuCreateDataSinkForFP", e); throw NuFX::Exception(__METHOD__ ": NuCreateDataSinkForFP", e);
} }
e = NuExtractThread(archive, rt.thread_index, sink); e = NuExtractThread(archive, rt.thread_index, sink);
if (e) if (e)
{ {
throw NuFXException(__METHOD__ ": NuExtractThread", e); throw NuFX::Exception(__METHOD__ ": NuExtractThread", e);
} }
fprintf(stderr, "Extracted disk image to %s\n", tmp); fprintf(stderr, "Extracted disk image to %s\n", tmp);
@ -210,7 +211,7 @@ bool SDKImage::Validate(MappedFile * f)
#define __METHOD__ "SDKImage::Validate" #define __METHOD__ "SDKImage::Validate"
if (!Validate(f, std::nothrow)) if (!Validate(f, std::nothrow))
throw Exception(__METHOD__ ": Invalid file format."); throw ::Exception(__METHOD__ ": Invalid file format.");
return true; return true;
} }

2
Makefile
View File

@ -13,7 +13,7 @@ ifdef HAVE_NUFX
DEVICE_OBJECTS += Device/SDKImage.o DEVICE_OBJECTS += Device/SDKImage.o
EXCEPTION_OBJECTS += NuFX/Exception.o EXCEPTION_OBJECTS += NuFX/Exception.o
LDFLAGS += -L/usr/local/lib/ LDFLAGS += -L/usr/local/lib/
LIBS += -lnufx -lz LIBS += -lnufx -lz -framework carbon
CPPFLAGS += -DHAVE_NUFX=1 CPPFLAGS += -DHAVE_NUFX=1
endif endif

2
bin/profuse.cpp
View File

@ -128,7 +128,9 @@ static void usage()
" --format=format specify the disk image format. Valid values are:\n" " --format=format specify the disk image format. Valid values are:\n"
" dc42 DiskCopy 4.2 Image\n" " dc42 DiskCopy 4.2 Image\n"
" davex Davex Disk Image\n" " davex Davex Disk Image\n"
#ifdef HAVE_NUFX
" sdk ShrinkIt Disk Image\n" " sdk ShrinkIt Disk Image\n"
#endif
" 2img Universal Disk Image\n" " 2img Universal Disk Image\n"
" do DOS Order Disk Image\n" " do DOS Order Disk Image\n"
" po ProDOS Order Disk Image (default)\n" " po ProDOS Order Disk Image (default)\n"