mirrors/nstool
1
0
Fork 0
mirror of https://github.com/jakcron/nstool.git synced 2024-12-23 03:05:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[nstool] Removed relative offsets in Pfs/Romfs Process because it isn't guarenteed to be reliable.

Browse source
This commit is contained in:
jakcron 2018-05-22 19:36:39 +08:00
parent 3437031128
commit 7c024c290b
4 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
programs/nstool/source/PfsProcess.cpp
View file

@ -20,9 +20,9 @@ void PfsProcess::displayFs()
if (mCliOutputType >= OUTPUT_VERBOSE) if (mCliOutputType >= OUTPUT_VERBOSE)
{ {
if (mPfs.getFsType() == mPfs.TYPE_PFS0) if (mPfs.getFsType() == mPfs.TYPE_PFS0)
printf(" (offset=0x%" PRIx64 ", size=0x%" PRIx64 ")\n", mBaseOffset + mPfs.getFileList()[i].offset, mPfs.getFileList()[i].size); printf(" (offset=0x%" PRIx64 ", size=0x%" PRIx64 ")\n", mPfs.getFileList()[i].offset, mPfs.getFileList()[i].size);
else else
printf(" (offset=0x%" PRIx64 ", size=0x%" PRIx64 ", hash_protected_size=0x%" PRIx64 ")\n", mBaseOffset + mPfs.getFileList()[i].offset, mPfs.getFileList()[i].size, mPfs.getFileList()[i].hash_protected_size); printf(" (offset=0x%" PRIx64 ", size=0x%" PRIx64 ", hash_protected_size=0x%" PRIx64 ")\n", mPfs.getFileList()[i].offset, mPfs.getFileList()[i].size, mPfs.getFileList()[i].hash_protected_size);
} }
else else
{ {
@ -105,7 +105,6 @@ PfsProcess::PfsProcess() :
mReader(nullptr), mReader(nullptr),
mCliOutputType(OUTPUT_NORMAL), mCliOutputType(OUTPUT_NORMAL),
mVerify(false), mVerify(false),
mBaseOffset(0),
mExtractPath(), mExtractPath(),
mExtract(false), mExtract(false),
mMountName(), mMountName(),
@ -158,7 +157,6 @@ void PfsProcess::process()
void PfsProcess::setInputFile(fnd::IFile* file, size_t offset, size_t size) void PfsProcess::setInputFile(fnd::IFile* file, size_t offset, size_t size)
{ {
mReader = new OffsetAdjustedIFile(file, offset, size); mReader = new OffsetAdjustedIFile(file, offset, size);
mBaseOffset = offset;
} }
void PfsProcess::setCliOutputMode(CliOutputType type) void PfsProcess::setCliOutputMode(CliOutputType type)

2
programs/nstool/source/PfsProcess.h
View file

@ -34,8 +34,6 @@ private:
CliOutputType mCliOutputType; CliOutputType mCliOutputType;
bool mVerify; bool mVerify;
size_t mBaseOffset;
std::string mExtractPath; std::string mExtractPath;
bool mExtract; bool mExtract;
std::string mMountName; std::string mMountName;

4
programs/nstool/source/RomfsProcess.cpp
View file

@ -18,7 +18,7 @@ void RomfsProcess::displayFile(const sFile& file, size_t tab) const
printf("%s", file.name.c_str()); printf("%s", file.name.c_str());
if (mCliOutputType >= OUTPUT_VERBOSE) if (mCliOutputType >= OUTPUT_VERBOSE)
{ {
printf(" (offset=0x%" PRIx64 ", size=0x%" PRIx64 ")", mBaseOffset + file.offset, file.size); printf(" (offset=0x%" PRIx64 ", size=0x%" PRIx64 ")", file.offset, file.size);
} }
putchar('\n'); putchar('\n');
} }
@ -226,7 +226,6 @@ RomfsProcess::RomfsProcess() :
mReader(nullptr), mReader(nullptr),
mCliOutputType(OUTPUT_NORMAL), mCliOutputType(OUTPUT_NORMAL),
mVerify(false), mVerify(false),
mBaseOffset(0),
mExtractPath(), mExtractPath(),
mExtract(false), mExtract(false),
mMountName(), mMountName(),
@ -267,7 +266,6 @@ void RomfsProcess::process()
void RomfsProcess::setInputFile(fnd::IFile* file, size_t offset, size_t size) void RomfsProcess::setInputFile(fnd::IFile* file, size_t offset, size_t size)
{ {
mReader = new OffsetAdjustedIFile(file, offset, size); mReader = new OffsetAdjustedIFile(file, offset, size);
mBaseOffset = offset;
} }
void RomfsProcess::setCliOutputMode(CliOutputType type) void RomfsProcess::setCliOutputMode(CliOutputType type)

2
programs/nstool/source/RomfsProcess.h
View file

@ -112,8 +112,6 @@ private:
CliOutputType mCliOutputType; CliOutputType mCliOutputType;
bool mVerify; bool mVerify;
size_t mBaseOffset;
std::string mExtractPath; std::string mExtractPath;
bool mExtract; bool mExtract;
std::string mMountName; std::string mMountName;