diff --git a/Pascal/FileEntry.cpp b/Pascal/FileEntry.cpp index 2889b56..8e367e4 100644 --- a/Pascal/FileEntry.cpp +++ b/Pascal/FileEntry.cpp @@ -1,17 +1,21 @@ + +#include +#include +#include +#include + #include #include #include #include +#include #include #include -#include -#include -#include -#include + using namespace LittleEndian; using namespace Pascal; @@ -197,7 +201,7 @@ int FileEntry::textRead(uint8_t *buffer, unsigned size, unsigned offset) unsigned l; unsigned count = 0; - auto_array tmp; + ProFUSE::auto_array tmp; unsigned tmpSize = 0; if (!_pageSize) textInit(); diff --git a/Pascal/Makefile b/Pascal/Makefile new file mode 100644 index 0000000..6889dc4 --- /dev/null +++ b/Pascal/Makefile @@ -0,0 +1,14 @@ +CC = g++ +CPPFLAGS += -g -Wall -I../ + + +all : Date.o Entry.o FileEntry.o VolumeEntry.o + +Date.o : Date.cpp Date.h + +Entry.o : Entry.cpp File.h + +FileEntry.o : FileEntry.cpp File.h Date.h + +VolumeEntry.o : VolumeEntry.cpp File.h Date.h + diff --git a/Pascal/VolumeEntry.cpp b/Pascal/VolumeEntry.cpp index a4d3386..c666eef 100644 --- a/Pascal/VolumeEntry.cpp +++ b/Pascal/VolumeEntry.cpp @@ -1,6 +1,6 @@ #include -#include +#include #include #include @@ -12,6 +12,9 @@ #pragma mark - #pragma mark VolumeEntry +using namespace LittleEndian; +using namespace Pascal; + unsigned VolumeEntry::ValidName(const char *cp) { // 7 chars max. Legal values: ascii, printable, @@ -86,7 +89,7 @@ VolumeEntry::VolumeEntry(const char *name, Device::BlockDevice *device) VolumeEntry::VolumeEntry(Device::BlockDevice *device) { - auto_array buffer(new uint8_t[512]); + ProFUSE::auto_array buffer(new uint8_t[512]); unsigned blockCount; // read the header block, then load up all the header