From 246d74992cceaadb6fb879c34ad7f6bac14c743a Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 14 Feb 2020 23:54:13 +0100 Subject: [PATCH] Unlinker: Fix not attempting to load specified zone files from arguments --- src/Unlinker/UnlinkerArgs.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Unlinker/UnlinkerArgs.cpp b/src/Unlinker/UnlinkerArgs.cpp index 17126603..e4da4e63 100644 --- a/src/Unlinker/UnlinkerArgs.cpp +++ b/src/Unlinker/UnlinkerArgs.cpp @@ -179,7 +179,7 @@ bool UnlinkerArgs::SetImageDumpingMode() bool UnlinkerArgs::ParseArgs(const int argc, const char** argv) { - if (!m_argument_parser.ParseArguments(argc, argv)) + if (!m_argument_parser.ParseArguments(argc - 1, &argv[1])) { PrintUsage(); return false; @@ -192,15 +192,16 @@ bool UnlinkerArgs::ParseArgs(const int argc, const char** argv) return false; } - const std::vector arguments = m_argument_parser.GetArguments(); - const size_t argCount = arguments.size(); - if (argCount <= 1) + m_zones_to_load = m_argument_parser.GetArguments(); + const size_t zoneCount = m_zones_to_load.size(); + if (zoneCount < 1) { // No zones to load specified... PrintUsage(); return false; } + // -v; --verbose SetVerbose(m_argument_parser.IsOptionSpecified(OPTION_VERBOSE));