Fix up handling of positional options in cvar handling.

- Fix up handling of positional options in cvar handling so that executables
  other than app can handle them properly.
- Fix command-line arguments for xenia-vfs-dump.

src/xenia/base/cvar.cc

@@ -1,3 +1,12 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2019 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
 #include "cvar.h"
 
 namespace cvar {
@@ -13,7 +22,9 @@ void PrintHelpAndExit() {
   exit(0);
 }
 
-void ParseLaunchArguments(int argc, char** argv) {
+void ParseLaunchArguments(int argc, char** argv,
+                          const std::string& positional_help,
+                          const std::vector<std::string>& positional_options) {
   options.add_options()("help", "Prints help and exit.");
   if (!CmdVars) CmdVars = new std::map<std::string, ICommandVar*>();
   if (!ConfigVars) ConfigVars = new std::map<std::string, IConfigVar*>();
@@ -29,8 +40,8 @@ void ParseLaunchArguments(int argc, char** argv) {
     configVar->AddToLaunchOptions(&options);
   }
   try {
-    options.positional_help("[Path to .iso/.xex]");
-    options.parse_positional({"target"});
+    options.positional_help(positional_help);
+    options.parse_positional(positional_options);
 
     auto result = options.parse(argc, argv);
     if (result.count("help")) {

src/xenia/base/cvar.h

@@ -1,10 +1,23 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2019 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
 #ifndef XENIA_CVAR_H_
 #define XENIA_CVAR_H_
+
 #include <map>
 #include <string>
+#include <vector>
+
 #include "cpptoml/include/cpptoml.h"
 #include "cxxopts/include/cxxopts.hpp"
 #include "xenia/base/string_util.h"
+
 namespace cvar {
 
 namespace toml {
@@ -204,7 +217,9 @@ inline void AddCommandVar(ICommandVar* cv) {
   if (!CmdVars) CmdVars = new std::map<std::string, ICommandVar*>();
   CmdVars->insert(std::pair<std::string, ICommandVar*>(cv->name(), cv));
 }
-void ParseLaunchArguments(int argc, char** argv);
+void ParseLaunchArguments(int argc, char** argv,
+                          const std::string& positional_help,
+                          const std::vector<std::string>& positional_options);
 
 template <typename T>
 T* define_configvar(const char* name, T* default_value, const char* description,
@@ -221,8 +236,6 @@ T* define_cmdvar(const char* name, T* default_value, const char* description) {
   AddCommandVar(cmdVar);
   return default_value;
 }
-#define DEFINE_double(name, default_value, description, category) \
-  DEFINE_CVar(name, default_value, description, category, false, double)
 
 #define DEFINE_int32(name, default_value, description, category) \
   DEFINE_CVar(name, default_value, description, category, false, int32_t)
@@ -230,6 +243,9 @@ T* define_cmdvar(const char* name, T* default_value, const char* description) {
 #define DEFINE_uint64(name, default_value, description, category) \
   DEFINE_CVar(name, default_value, description, category, false, uint64_t)
 
+#define DEFINE_double(name, default_value, description, category) \
+  DEFINE_CVar(name, default_value, description, category, false, double)
+
 #define DEFINE_string(name, default_value, description, category) \
   DEFINE_CVar(name, default_value, description, category, false, std::string)
 
@@ -275,4 +291,5 @@ T* define_cmdvar(const char* name, T* default_value, const char* description) {
   }
 
 }  // namespace cvar
+
 #endif  // XENIA_CVAR_H_

src/xenia/base/main.h

@@ -2,7 +2,7 @@
  ******************************************************************************
  * Xenia : Xbox 360 Emulator Research Project                                 *
  ******************************************************************************
- * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Copyright 2019 Ben Vanik. All rights reserved.                             *
  * Released under the BSD license - see LICENSE in the root for more details. *
  ******************************************************************************
  */
@@ -13,6 +13,7 @@
 #include <string>
 #include <vector>
 
+#include "xenia/base/cvar.h"
 #include "xenia/base/platform.h"
 
 namespace xe {
@@ -24,14 +25,19 @@ bool has_console_attached();
 // launch.
 struct EntryInfo {
   std::wstring name;
-  std::wstring usage;
+  std::string positional_usage;
+  std::vector<std::string> positional_options;
   int (*entry_point)(const std::vector<std::wstring>& args);
 };
 EntryInfo GetEntryInfo();
 
-#define DEFINE_ENTRY_POINT(name, usage, entry_point)  \
-  xe::EntryInfo xe::GetEntryInfo() {                  \
-    return xe::EntryInfo({name, usage, entry_point}); \
+#define DEFINE_ENTRY_POINT(name, entry_point, positional_usage, ...)       \
+  xe::EntryInfo xe::GetEntryInfo() {                                       \
+    std::initializer_list<std::string> positional_options = {__VA_ARGS__}; \
+    return xe::EntryInfo(                                                  \
+        {name, positional_usage,                                           \
+         std::vector<std::string>(std::move(positional_options)),          \
+         entry_point});                                                    \
   }
 
 }  // namespace xe

src/xenia/base/main_posix.cc

@@ -22,7 +22,8 @@ bool has_console_attached() { return true; }
 extern "C" int main(int argc, char** argv) {
   auto entry_info = xe::GetEntryInfo();
 
-  cvar::ParseLaunchArguments(argc, argv);
+  cvar::ParseLaunchArguments(argc, argv, entry_info.positional_usage,
+                             entry_info.positional_options);
 
   std::vector<std::wstring> args;
   for (int n = 0; n < argc; n++) {

src/xenia/base/main_win.cc

@@ -105,7 +105,8 @@ int Main() {
     std::wcstombs(argva[n], argv[n], len + 1);
   }
 
-  cvar::ParseLaunchArguments(argca, argva);
+  cvar::ParseLaunchArguments(argca, argva, entry_info.positional_usage,
+                             entry_info.positional_options);
 
   // Widen all remaining flags and convert to usable strings.
   std::vector<std::wstring> args;