diff options
| author | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2014-05-05 19:43:02 +0000 |
|---|---|---|
| committer | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2014-05-05 19:43:02 +0000 |
| commit | 4620c15677468a9d678fd8d12c337e5827b7e07e (patch) | |
| tree | 78253549f490849836624ecdeda68852473e6eb7 | |
| parent | removed empty dirs (diff) | |
| download | gpg4usb-4620c15677468a9d678fd8d12c337e5827b7e07e.tar.gz gpg4usb-4620c15677468a9d678fd8d12c337e5827b7e07e.zip | |
fix decrypt on windows and remove debugging output
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@1107 34ebc366-c3a9-4b3c-9f84-69acf7962910
| -rw-r--r-- | kgpg/klinebufferedprocess.cpp | 17 | ||||
| -rw-r--r-- | kgpg/kprocess.cpp | 2 | ||||
| -rw-r--r-- | kgpg/transactions/kgpgtextorfiletransaction.cpp | 2 | ||||
| -rw-r--r-- | kgpg/transactions/kgpgtransaction.cpp | 6 |
4 files changed, 21 insertions, 6 deletions
diff --git a/kgpg/klinebufferedprocess.cpp b/kgpg/klinebufferedprocess.cpp index 00099af..4ee0552 100644 --- a/kgpg/klinebufferedprocess.cpp +++ b/kgpg/klinebufferedprocess.cpp @@ -77,10 +77,25 @@ bool KLineBufferedProcess::readLineStandardOutput(QByteArray *line) // don't copy '\n' *line = d->m_stdoutBuffer.left(d->m_newlineInStdout); + +#ifdef Q_OS_WIN32 + // sometimes there may be a single "\n", which confuses decrypt on win + if(d->m_stdoutBuffer.at(d->m_newlineInStdout) == '\r') { + d->m_stdoutBuffer.remove(0, d->m_newlineInStdout + 2); + } else { + d->m_stdoutBuffer.remove(0, d->m_newlineInStdout + 1); + } + + int lepos = d->m_stdoutBuffer.indexOf("\n"); + if(d->m_stdoutBuffer.at(lepos-1) == '\r') { + lepos = lepos - 1; + } + d->m_newlineInStdout = lepos; +#else d->m_stdoutBuffer.remove(0, d->m_newlineInStdout + d->m_lineEnd.length()); d->m_newlineInStdout = d->m_stdoutBuffer.indexOf(d->m_lineEnd); - +#endif return true; } diff --git a/kgpg/kprocess.cpp b/kgpg/kprocess.cpp index 907c75c..ba71ebd 100644 --- a/kgpg/kprocess.cpp +++ b/kgpg/kprocess.cpp @@ -341,7 +341,7 @@ QStringList KProcess::program() const void KProcess::start() { Q_D(KProcess); - qDebug() << "prog: " << d->prog << " | args: " << d->args; + //qDebug() << "prog: " << d->prog << " | args: " << d->args; QProcess::start(d->prog, d->args, d->openMode); } diff --git a/kgpg/transactions/kgpgtextorfiletransaction.cpp b/kgpg/transactions/kgpgtextorfiletransaction.cpp index 82055b2..88ebd01 100644 --- a/kgpg/transactions/kgpgtextorfiletransaction.cpp +++ b/kgpg/transactions/kgpgtextorfiletransaction.cpp @@ -50,7 +50,7 @@ KGpgTextOrFileTransaction::setUrls(const QList<QUrl> &files) m_inpfiles = files; //qDebug() << "files set:"; foreach(QUrl file, m_inpfiles) { - qDebug() << file.toString(); + //qDebug() << file.toString(); } } diff --git a/kgpg/transactions/kgpgtransaction.cpp b/kgpg/transactions/kgpgtransaction.cpp index 003c33d..38261e7 100644 --- a/kgpg/transactions/kgpgtransaction.cpp +++ b/kgpg/transactions/kgpgtransaction.cpp @@ -87,7 +87,7 @@ KGpgTransactionPrivate::slotReadReady() #ifdef KGPG_DEBUG_TRANSACTIONS qDebug() << m_parent << line; #endif /* KGPG_DEBUG_TRANSACTIONS */ - qDebug() << "trans-read: " << m_parent << line; + //qDebug() << "trans-read: " << m_parent << line; if (line.startsWith(QLatin1String("[GNUPG:] USERID_HINT "))) { @@ -172,7 +172,7 @@ KGpgTransactionPrivate::sendQuit(void) if (m_quitTries++ >= 3) { qDebug() << "tried" << m_quitTries << "times to quit the GnuPG session"; qDebug() << "last input was" << m_quitLines; - qDebug() << "please file a bug report at https://bugs.kde.org"; + //qDebug() << "please file a bug report at https://bugs.kde.org"; m_process->closeWriteChannel(); m_success = KGpgTransaction::TS_MSG_SEQUENCE; } @@ -215,7 +215,7 @@ KGpgTransactionPrivate::write(const QByteArray &a) #ifdef KGPG_DEBUG_TRANSACTIONS qDebug() << m_parent << a; #endif /* KGPG_DEBUG_TRANSACTIONS */ - qDebug() << "trans-write: " << m_parent << a; + //qDebug() << "trans-write: " << m_parent << a; } void |