From b7abc03ed0c3f638af3577ba728fb6cad532f2cc Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Tue, 12 Jan 2010 17:04:05 +0100
Subject: [PATCH] Maemo: Fix race condition in SSH output reader.
---
src/plugins/qt4projectmanager/qt-maemo/maemosshconnection.cpp | 4 +++-
src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemosshconnection.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemosshconnection.cpp
index 1ad9d2b8681..3b7151f1e9c 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemosshconnection.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemosshconnection.cpp
@@ -132,9 +132,11 @@ void MaemoInteractiveSshConnection::runCommand(const QString &command)
const char * const error = lastError();
if (error)
throw MaemoSshException(tr("SSH error: %1").arg(error));
- const char * output = ssh.readAndReset(channel(), alloc);
+ const char * const output = ssh.readAndReset(channel(), alloc);
if (output) {
emit remoteOutput(QString::fromUtf8(output));
+ if (!done)
+ done = strstr(output, m_prompt) != 0;
delete[] output;
}
} while (!done && !stopRequested());
diff --git a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri b/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
index 13fb853cf1c..6b2db8cfc52 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
+++ b/src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
@@ -6,7 +6,6 @@ SUPPORT_QT_MAEMO = $$(QTCREATOR_WITH_MAEMO)
# INCLUDEPATH += $$PWD/../../../libs/3rdparty/net7ssh/src
# INCLUDEPATH += $$PWD/../../../libs/3rdparty/botan/build
# LIBS += -l$$qtLibraryTarget(Net7ssh) -l$$qtLibraryTarget(Botan)
-
HEADERS += $$PWD/maemorunconfiguration.h \
$$PWD/maemomanager.h \
$$PWD/maemotoolchain.h \
--
GitLab