From 23786515f9ec68ed1e7352513d4530077bfe24bb Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 13 Jun 2015 14:13:19 -0400
Subject: [PATCH] CLI2: Implemented simple argument capture, with no
 processing.

---
 src/CLI2.cpp    | 7 +++++++
 src/CLI2.h      | 4 +++-
 src/Context.cpp | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index f0db397d1..2b87fcb95 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -330,6 +330,13 @@ void CLI2::entity (const std::string& category, const std::string& name)
   _entities.insert (std::pair <std::string, std::string> (category, name));
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// Capture a single argument.
+void CLI2::add (const std::string& argument)
+{
+  _original_args.push_back (argument);
+}
+
 /*
 ////////////////////////////////////////////////////////////////////////////////
 // Capture the original, intact command line arguments.
diff --git a/src/CLI2.h b/src/CLI2.h
index 025a5720e..9f17772a0 100644
--- a/src/CLI2.h
+++ b/src/CLI2.h
@@ -79,6 +79,8 @@ public:
   ~CLI2 ();
   void alias (const std::string&, const std::string&);
   void entity (const std::string&, const std::string&);
+
+  void add (const std::string&);
 /*
   void initialize (int, const char**);
   void add (const std::string&);
@@ -143,8 +145,8 @@ private:
 public:
   std::multimap <std::string, std::string> _entities;
   std::map <std::string, std::string>      _aliases;
-/*
   std::vector <std::string>                _original_args;
+/*
   std::vector <A>                          _args;
 
   std::vector <std::pair <int, int>>       _id_ranges;
diff --git a/src/Context.cpp b/src/Context.cpp
index 73ca5a92c..f2cd375d3 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -226,6 +226,9 @@ int Context::initialize (int argc, const char** argv)
     //
     ////////////////////////////////////////////////////////////////////////////
 
+    for (int i = 0; i < argc; i++)
+      cli2.add (argv[i]);
+
     cli.initialize (argc, argv);
     cli.analyze (true, true);