Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2026-01-05 10:35:47 -05:00
Code Issues Projects Releases Packages Wiki Activity

text for inserting password

Browse source
This commit is contained in:
thez3ro 2017-02-16 20:26:51 +01:00 • committed by Louis-Bertrand Varin
parent 98911af396
commit e01e9715b9
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/cli/Merge.cpp
View file

@ -35,6 +35,7 @@ int Merge::execute(int argc, char** argv)
{
QCoreApplication app(argc, argv);
QTextStream out(stdout);
QCommandLineParser parser;
parser.setApplicationDescription(QCoreApplication::translate("main", "Merge two databases."));
@ -53,8 +54,10 @@ int Merge::execute(int argc, char** argv)
return EXIT_FAILURE;
}
out << "Insert the database password\n> ";
out.flush();
static QTextStream inputTextStream(stdin, QIODevice::ReadOnly);
QString line1 = inputTextStream.readLine();
CompositeKey key1 = CompositeKey::readFromLine(line1);
@ -128,7 +131,7 @@ int Merge::execute(int argc, char** argv)
return EXIT_FAILURE;
}
qDebug("Successfully merged the database files.\n");
out << "Successfully merged the database files.\n";
return EXIT_SUCCESS;
}