Make subcommand construction in MultiCommand lazy

(cherry picked from commit a0de58f471c9087d8e6cc60a6078f9940a125b15)

1 files changed, 10 insertions, 3 deletions

diff --git a/src/libutil/args.hh b/src/libutil/args.hh
index 21f4327c5..54336b17b 100644
--- a/src/libutil/args.hh
+++ b/src/libutil/args.hh
@@ -192,8 +192,15 @@ public:
    run() method. */
 struct Command : virtual Args
 {
+private:
+    std::string _name;
+
+public:
+
     virtual ~Command() { }
-    virtual std::string name() = 0;
+
+    std::string name() { return _name; }
+
     virtual void prepare() { };
     virtual void run() = 0;
 
@@ -210,7 +217,7 @@ struct Command : virtual Args
     void printHelp(const string & programName, std::ostream & out) override;
 };
 
-typedef std::map<std::string, ref<Command>> Commands;
+typedef std::map<std::string, std::function<ref<Command>()>> Commands;
 
 /* An argument parser that supports multiple subcommands,
    i.e. ‘<command> <subcommand>’. */
@@ -221,7 +228,7 @@ public:
 
     std::shared_ptr<Command> command;
 
-    MultiCommand(const std::vector<ref<Command>> & commands);
+    MultiCommand(const Commands & commands);
 
     void printHelp(const string & programName, std::ostream & out) override;