feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Fix corner case in end-of-remote-process detection.

Browse Source
This commit is contained in:
ck
2010-05-12 16:45:23 +02:00
parent a8e464abd9
commit 64d65fb698
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
View File

@@ -117,7 +117,8 @@ bool MaemoSshRunner::runInternal()
void MaemoSshRunner::handleRemoteOutput() void MaemoSshRunner::handleRemoteOutput()
{ {
const QByteArray output = m_connection->waitForRemoteOutput(0); const QByteArray output
= m_potentialEndMarkerPrefix + m_connection->waitForRemoteOutput(0);
// Wait for a prompt before sending the command. // Wait for a prompt before sending the command.
if (!m_promptEncountered) { if (!m_promptEncountered) {
@@ -143,8 +144,6 @@ void MaemoSshRunner::handleRemoteOutput()
/* /*
* The output the user should see is everything after the first * The output the user should see is everything after the first
* and before the last occurrence of our marker string. * and before the last occurrence of our marker string.
* Note: We don't currently handle the case of an incomplete unicode
* character being sent.
*/ */
int firstCharToEmit; int firstCharToEmit;
int charsToEmitCount; int charsToEmitCount;
@@ -168,16 +167,19 @@ void MaemoSshRunner::handleRemoteOutput()
if (m_endMarkerCount == 0) { if (m_endMarkerCount == 0) {
charsToEmitCount = 0; charsToEmitCount = 0;
} else { } else {
firstCharToEmit = 0; firstCharToEmit = m_potentialEndMarkerPrefix.count();
charsToEmitCount = -1; charsToEmitCount = -1;
} }
} }
if (charsToEmitCount != 0) if (charsToEmitCount != 0) {
emit remoteOutput(QString::fromUtf8(output.data() + firstCharToEmit, emit remoteOutput(QString::fromUtf8(output.data() + firstCharToEmit,
charsToEmitCount)); charsToEmitCount));
}
if (m_endMarkerCount == 2) if (m_endMarkerCount == 2)
stop(); stop();
m_potentialEndMarkerPrefix = output.right(EndMarker.count() - 1);
} }
const QByteArray MaemoSshRunner::EndMarker(QString(QChar(0x13a0)).toUtf8()); const QByteArray MaemoSshRunner::EndMarker(QString(QChar(0x13a0)).toUtf8());

1
src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h
View File

@@ -104,6 +104,7 @@ private:
const char *m_prompt; const char *m_prompt;
int m_endMarkerCount; int m_endMarkerCount;
bool m_promptEncountered; bool m_promptEncountered;
QByteArray m_potentialEndMarkerPrefix;
}; };