Apple-2-Tools/profuse
1
0
Fork 0
mirror of https://github.com/ksherlock/profuse.git synced 2026-04-19 07:21:23 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ksherlock
2010-05-21 23:35:12 +00:00
parent deec48b728
commit 895bab385c
2 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pascal/VolumeEntry.cpp
+33 -36
View File
@@ -96,8 +96,9 @@ VolumeEntry::VolumeEntry(const char *name, Device::BlockDevice *device)
VolumeEntry::VolumeEntry(Device::BlockDevice *device)
{
ProFUSE::auto_array<uint8_t> buffer(new uint8_t[512]);
unsigned blockCount;
ProFUSE::auto_array<uint8_t> buffer(new uint8_t[512]);
// read the header block, then load up all the header
// blocks.
@@ -117,12 +118,7 @@ VolumeEntry::VolumeEntry(Device::BlockDevice *device)
if (blockCount > 1)
{
buffer.reset(new uint8_t[512 * blockCount]);
for (unsigned i = 0; i < blockCount; ++i)
{
_cache->read(2 + i, buffer.get() + 512 * i);
}
buffer.reset(readDirectoryHeader());
}
// now load up all the children.
@@ -214,7 +210,7 @@ unsigned VolumeEntry::unlink(const char *name)
unsigned index;
if (_device->readOnly()) return 0x2b; // WRITE-PROTECTED DISK
if (_device->readOnly()) return ProFUSE::drvrWrtProt; // WRITE-PROTECTED DISK
for(index = 0; index < _fileCount; ++index)
{
@@ -226,23 +222,17 @@ unsigned VolumeEntry::unlink(const char *name)
break;
}
}
if (index == _fileCount) return 0x46; // FILE NOT FOUND
if (index == _fileCount) return ProFUSE::fileNotFound; // FILE NOT FOUND
_files.erase(_files.begin() + index);
_fileCount--;
// need to update the header blocks.
unsigned blockCount = blocks();
ProFUSE::auto_array<uint8_t> buffer(new uint8_t[512 * blockCount]);
ProFUSE::auto_array<uint8_t> buffer(readDirectoryHeader());
// load up blocks.
// since entries span blocks, we can't do this via pointer.
for (unsigned i = 0; i < blockCount; ++i)
{
_cache->read(2 + i, buffer.get() + 512 * i);
}
// update the filecount.
IOBuffer b(buffer.get(), 512 * blockCount);
IOBuffer b(buffer.get(), 512 * blocks());
writeDirectoryEntry(&b);
// move up all the entries.
@@ -252,10 +242,7 @@ unsigned VolumeEntry::unlink(const char *name)
std::memset(buffer.get() + 0x1a + _fileCount * 0x1a, 0, 0x1a);
// now write to disk.
for (unsigned i = 0; i < blockCount; ++i)
{
_cache->write(2 + i, buffer.get() + 512 * i);
}
writeDirectoryHeader(buffer.get());
_cache->sync();
return 0;
@@ -303,17 +290,10 @@ unsigned VolumeEntry::krunch()
// need to update the header blocks.
unsigned blockCount = blocks();
ProFUSE::auto_array<uint8_t> buffer(new uint8_t[512 * blockCount]);
IOBuffer b(buffer.get(), 512 * blockCount);
// load up the directory blocks.
for (unsigned i = 0; i < blocks(); ++i)
{
_cache->read(2 + i, buffer.get() + 512 * i);
}
ProFUSE::auto_array<uint8_t> buffer(readDirectoryHeader());
IOBuffer b(buffer.get(), 512 * blocks());
prevBlock = lastBlock();
unsigned offset = 0;
@@ -353,10 +333,7 @@ unsigned VolumeEntry::krunch()
// now save the directory entries.
// load up the directory blocks.
for (unsigned i = 0; i < blocks(); ++i)
{
_cache->write(2 + i, buffer.get() + 512 * i);
}
writeDirectoryHeader(buffer.get());
_cache->sync();
@@ -418,3 +395,23 @@ void VolumeEntry::writeDirectoryEntry(IOBuffer *b)
}
uint8_t *VolumeEntry::readDirectoryHeader()
{
ProFUSE::auto_array<uint8_t> buffer(new uint8_t[512 * blocks()]);
for (unsigned i = 0; i < blocks(); ++i)
{
_cache->read(2 + i, buffer.get() + i * 512);
}
return buffer.release();
}
void VolumeEntry::writeDirectoryHeader(uint8_t *buffer)
{
for (unsigned i = 0; i < blocks(); ++i)
{
_cache->write(2 + i, buffer + 512 * i);
}
}