mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 13:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Use stderr for help text on error.

Browse source 
Also not sure why qCritical was used instead of and stderr output
stream. Added translation on the invalid command string.
This commit is contained in:
louib 2020-01-04 16:23:23 -05:00 • committed by Jonathan White
parent bf8e2e5959
commit b34a8f9d94
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/cli/keepassxc-cli.cpp
View file

@ -189,6 +189,7 @@ int main(int argc, char** argv)
Commands::setupCommands(false); Commands::setupCommands(false);
TextStream out(stdout); TextStream out(stdout);
TextStream err(stderr);
QStringList arguments; QStringList arguments;
for (int i = 0; i < argc; ++i) { for (int i = 0; i < argc; ++i) {
arguments << QString(argv[i]); arguments << QString(argv[i]);
@ -223,6 +224,7 @@ int main(int argc, char** argv)
out << debugInfo << endl; out << debugInfo << endl;
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
// showHelp exits the application immediately.
parser.showHelp(); parser.showHelp();
} }
@ -234,10 +236,9 @@ int main(int argc, char** argv)
auto command = Commands::getCommand(commandName); auto command = Commands::getCommand(commandName);
if (!command) { if (!command) {
qCritical("Invalid command %s.", qPrintable(commandName)); err << QObject::tr("Invalid command %1.").arg(commandName) << endl;
// showHelp exits the application immediately, so we need to set the err << parser.helpText();
// exit code here. return EXIT_FAILURE;
parser.showHelp(EXIT_FAILURE);
} }
// Removing the first argument (keepassxc). // Removing the first argument (keepassxc).