nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Initialize Command::_name

Browse source 
(cherry picked from commit d0a769cb06)
This commit is contained in:
Eelco Dolstra 2019-06-19 23:37:40 +02:00
parent ac67685606
commit 5e449b43ed
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libutil/args.cc
View file

@ -224,6 +224,7 @@ MultiCommand::MultiCommand(const Commands & commands)
if (i == commands.end()) if (i == commands.end())
throw UsageError("'%s' is not a recognised command", ss[0]); throw UsageError("'%s' is not a recognised command", ss[0]);
command = i->second(); command = i->second();
command->_name = ss[0];
}}); }});
} }
@ -246,6 +247,7 @@ void MultiCommand::printHelp(const string & programName, std::ostream & out)
Table2 table; Table2 table;
for (auto & i : commands) { for (auto & i : commands) {
auto command = i.second(); auto command = i.second();
command->_name = i.first;
auto descr = command->description(); auto descr = command->description();
if (!descr.empty()) if (!descr.empty())
table.push_back(std::make_pair(command->name(), descr)); table.push_back(std::make_pair(command->name(), descr));

2
src/libutil/args.hh
View file

@ -195,6 +195,8 @@ struct Command : virtual Args
private: private:
std::string _name; std::string _name;
friend class MultiCommand;
public: public:
virtual ~Command() { } virtual ~Command() { }