DarkStore-3DS/Project_CTR
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/Project_CTR.git synced 2026-07-04 16:59:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Honour opt.info when running CiaProcess

Browse Source
This commit is contained in:
Jakcron
2022-03-29 17:26:12 +08:00
parent d9f9d4ec48
commit cbc20b2a15
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ctrtool/src/CiaProcess.cpp
+1 -3
View File
@@ -13,7 +13,6 @@ ctrtool::CiaProcess::CiaProcess() :
mInputStream(), mInputStream(),
mKeyBag(), mKeyBag(),
mShowHeaderInfo(false), mShowHeaderInfo(false),
mShowFs(false),
mVerbose(false), mVerbose(false),
mVerify(false), mVerify(false),
mCertExtractPath(), mCertExtractPath(),
@@ -49,10 +48,9 @@ void ctrtool::CiaProcess::setKeyBag(const ctrtool::KeyBag& key_bag)
mNcchProcess.setKeyBag(key_bag); mNcchProcess.setKeyBag(key_bag);
} }
void ctrtool::CiaProcess::setCliOutputMode(bool show_header_info, bool show_fs) void ctrtool::CiaProcess::setCliOutputMode(bool show_header_info)
{ {
mShowHeaderInfo = show_header_info; mShowHeaderInfo = show_header_info;
mShowFs = show_fs;
} }
void ctrtool::CiaProcess::setVerboseMode(bool verbose) void ctrtool::CiaProcess::setVerboseMode(bool verbose)
ctrtool/src/CiaProcess.h
+1 -2
View File
@@ -20,7 +20,7 @@ public:
void setInputStream(const std::shared_ptr<tc::io::IStream>& input_stream); void setInputStream(const std::shared_ptr<tc::io::IStream>& input_stream);
void setKeyBag(const ctrtool::KeyBag& key_bag); void setKeyBag(const ctrtool::KeyBag& key_bag);
void setCliOutputMode(bool show_header_info, bool show_fs); void setCliOutputMode(bool show_header_info);
void setVerboseMode(bool verbose); void setVerboseMode(bool verbose);
void setVerifyMode(bool verify); void setVerifyMode(bool verify);
void setCertExtractPath(const tc::io::Path& extract_path); void setCertExtractPath(const tc::io::Path& extract_path);
@@ -44,7 +44,6 @@ private:
std::shared_ptr<tc::io::IStream> mInputStream; std::shared_ptr<tc::io::IStream> mInputStream;
ctrtool::KeyBag mKeyBag; ctrtool::KeyBag mKeyBag;
bool mShowHeaderInfo; bool mShowHeaderInfo;
bool mShowFs;
bool mVerbose; bool mVerbose;
bool mVerify; bool mVerify;
tc::Optional<tc::io::Path> mCertExtractPath; tc::Optional<tc::io::Path> mCertExtractPath;
ctrtool/src/main.cpp
+1 -1
View File
@@ -126,7 +126,7 @@ int umain(const std::vector<std::string>& args, const std::vector<std::string>&
ctrtool::CiaProcess proc; ctrtool::CiaProcess proc;
proc.setInputStream(infile_stream); proc.setInputStream(infile_stream);
proc.setKeyBag(set.opt.keybag); proc.setKeyBag(set.opt.keybag);
proc.setCliOutputMode(true, false); proc.setCliOutputMode(set.opt.info);
proc.setVerboseMode(set.opt.verbose); proc.setVerboseMode(set.opt.verbose);
proc.setVerifyMode(set.opt.verify); proc.setVerifyMode(set.opt.verify);
if (set.rom.content_extract_path.isSet()) if (set.rom.content_extract_path.isSet())