drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[nostalgia] Switch Studio to PassThroughFS

Browse Source
This commit is contained in:
Gary Talent
2019-01-15 22:33:13 -06:00
parent e5c5c0da43
commit af0e24d9bf
26 changed files with 159 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nostalgia/tools/CMakeLists.txt
View File

@@ -13,6 +13,8 @@ target_link_libraries(
OxClArgs
OxFS
OxStd
OxTrace
OxMetalClaw
NostalgiaCommon
NostalgiaCore
)

23
src/nostalgia/tools/pack.cpp
View File

@@ -118,21 +118,28 @@ int run(ClArgs args) {
size_t fsBuffSize;
auto fsBuff = loadFileBuff(argFsPath, &fsBuffSize);
if (fsBuff && !err) {
auto fs = createFileSystem(fsBuff, fsBuffSize);
auto fs = FileSystem32(FileStore32(fsBuff, fsBuffSize));
if (fs) {
fs = expandCopyCleanup(fs, fs->size() + fs->spaceNeeded(imgDataBuffSize));
fsBuff = fs->buff(); // update fsBuff pointer in case there is a new buff
err |= fs->write(argInode, imgDataBuff, imgDataBuffSize);
if (fs.valid()) {
const auto sizeNeeded = fs.size() + fs.spaceNeeded(imgDataBuffSize);
if (sizeNeeded > fsBuffSize) {
auto newBuff = new uint8_t[sizeNeeded];
memcpy(newBuff, fsBuff, fsBuffSize);
delete[] fsBuff;
fsBuff = newBuff;
fsBuffSize = sizeNeeded;
}
fsBuff = fs.buff(); // update fsBuff pointer in case there is a new buff
err |= fs.write(argInode, imgDataBuff, imgDataBuffSize);
if (!err) {
if (argCompact) {
fs->resize();
FileStore32(fsBuff, fsBuffSize).compact();
}
auto fsFile = fopen(argFsPath.toUtf8(), "wb");
if (fsFile) {
err = fwrite(fsBuff, fs->size(), 1, fsFile) != 1;
err = fwrite(fsBuff, fs.size(), 1, fsFile) != 1;
err |= fclose(fsFile);
if (err) {
cerr << "Could not write to file system file.\n";
@@ -143,8 +150,6 @@ int run(ClArgs args) {
} else {
err = 3;
}
delete fs;
} else {
err = 4;
}