Avoid having Command* objects be created until requested.

Avoids various static init and destruction hassles.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/cli/main.cpp b/src/cli/main.cpp
index f054e6005..f6bbcc30e 100644
--- a/src/cli/main.cpp
+++ b/src/cli/main.cpp
@@ -40,13 +40,13 @@ int main(int argc, char* argv[])
 
    const std::string cmd_name = (argc <= 1) ? "help" : argv[1];
 
-   if(cmd_name == "help" || cmd_name == "--help")
+   if(cmd_name == "help" || cmd_name == "--help" || cmd_name == "-h")
       {
       std::cout << main_help();
       return 1;
       }
 
-   Botan_CLI::Command* cmd = Botan_CLI::Command::get_cmd(cmd_name);
+   std::unique_ptr<Botan_CLI::Command> cmd(Botan_CLI::Command::get_cmd(cmd_name));
 
    if(!cmd)
       {