Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-30 09:46:30 -05:00
Code Issues Packages Projects Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cli/Extract.cpp
View File

@ -33,6 +33,7 @@
int Extract::execute(int argc, char **argv) int Extract::execute(int argc, char **argv)
{ {
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
QTextStream out(stdout);
QCommandLineParser parser; QCommandLineParser parser;
parser.setApplicationDescription(QCoreApplication::translate("main", parser.setApplicationDescription(QCoreApplication::translate("main",
@ -46,6 +47,9 @@ int Extract::execute(int argc, char **argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
out << "Insert the database password\n> ";
out.flush();
static QTextStream inputTextStream(stdin, QIODevice::ReadOnly); static QTextStream inputTextStream(stdin, QIODevice::ReadOnly);
QString line = inputTextStream.readLine(); QString line = inputTextStream.readLine();
CompositeKey key = CompositeKey::readFromLine(line); CompositeKey key = CompositeKey::readFromLine(line);
@ -78,7 +82,6 @@ int Extract::execute(int argc, char **argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
QTextStream out(stdout);
out << xmlData.constData() << "\n"; out << xmlData.constData() << "\n";
return EXIT_SUCCESS; return EXIT_SUCCESS;

4
src/cli/List.cpp
View File

@ -60,6 +60,7 @@ void printGroup(Group* group, QString baseName, int depth) {
int List::execute(int argc, char **argv) int List::execute(int argc, char **argv)
{ {
QCoreApplication app(argc, argv); QCoreApplication app(argc, argv);
QTextStream out(stdout);
QCommandLineParser parser; QCommandLineParser parser;
parser.setApplicationDescription(QCoreApplication::translate("main", parser.setApplicationDescription(QCoreApplication::translate("main",
@ -73,6 +74,9 @@ int List::execute(int argc, char **argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
out << "Insert the database password\n> ";
out.flush();
static QTextStream inputTextStream(stdin, QIODevice::ReadOnly); static QTextStream inputTextStream(stdin, QIODevice::ReadOnly);
QString line = inputTextStream.readLine(); QString line = inputTextStream.readLine();
CompositeKey key = CompositeKey::readFromLine(line); CompositeKey key = CompositeKey::readFromLine(line);

7
src/cli/Merge.cpp
View File

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