diff --git a/ctrtool/src/Settings.cpp b/ctrtool/src/Settings.cpp index 34d07cc..1cfafbe 100644 --- a/ctrtool/src/Settings.cpp +++ b/ctrtool/src/Settings.cpp @@ -407,6 +407,7 @@ void ctrtool::SettingsInitializer::parse_args(const std::vector& ar opts.registerUnrecognisedOptionHandler(std::shared_ptr(new UnkOptionHandler(mModuleLabel))); // register handler for deprecated options DeprecatedOptionHandler + opts.registerOptionHandler(std::shared_ptr(new DeprecatedOptionHandler("Extract flag is redundant.", {"-x", "--extract"}))); opts.registerOptionHandler(std::shared_ptr(new DeprecatedOptionHandler("Generic AES/RSA keys are initialised internally.", {"-k", "--keyset"}))); opts.registerOptionHandler(std::shared_ptr(new DeprecatedOptionHandler("", {"--unitsize"}))); opts.registerOptionHandler(std::shared_ptr(new DeprecatedOptionHandler("All common keys are initialised internally.", {"--commonkey"}))); @@ -416,7 +417,6 @@ void ctrtool::SettingsInitializer::parse_args(const std::vector& ar // get option flags opts.registerOptionHandler(std::shared_ptr(new FlagOptionHandler(opt.info, {"-i", "--info"}))); - opts.registerOptionHandler(std::shared_ptr(new FlagOptionHandler(opt.info, {"-x", "--extract"}))); opts.registerOptionHandler(std::shared_ptr(new FlagOptionHandler(opt.plain, {"-p", "--plain"}))); opts.registerOptionHandler(std::shared_ptr(new FlagOptionHandler(opt.raw, {"-r", "--raw"}))); opts.registerOptionHandler(std::shared_ptr(new FlagOptionHandler(opt.verbose, {"-v", "--verbose"}))); @@ -595,8 +595,8 @@ void ctrtool::SettingsInitializer::usage_text() "Options:\n" " -i, --info Show file info.\n" " This is the default action.\n" - " -x, --extract Extract data from file.\n" - " This is also the default action.\n" + //" -x, --extract Extract data from file.\n" + //" This is also the default action.\n" " -p, --plain Extract data without decrypting.\n" " -r, --raw Keep raw data, don't unpack.\n" //" -k, --keyset=file Specify keyset file.\n" diff --git a/ctrtool/src/Settings.h b/ctrtool/src/Settings.h index c8a839a..be4ef4b 100644 --- a/ctrtool/src/Settings.h +++ b/ctrtool/src/Settings.h @@ -40,7 +40,6 @@ struct Settings struct Options { bool info; - bool extract; bool plain; bool raw; bool verbose; @@ -124,7 +123,6 @@ struct Settings infile.path = tc::Optional(); opt.info = true; - opt.extract = true; opt.plain = false; opt.raw = false; opt.verbose = false;