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

Maemo: Fix race condition in SSH output reader.

Browse Source
This commit is contained in:
ck
2010-01-12 17:04:05 +01:00
parent e4024d228c
commit b7abc03ed0
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt-maemo/maemosshconnection.cpp
View File

@@ -132,9 +132,11 @@ void MaemoInteractiveSshConnection::runCommand(const QString &command)
const char * const error = lastError(); const char * const error = lastError();
if (error) if (error)
throw MaemoSshException(tr("SSH error: %1").arg(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) { if (output) {
emit remoteOutput(QString::fromUtf8(output)); emit remoteOutput(QString::fromUtf8(output));
if (!done)
done = strstr(output, m_prompt) != 0;
delete[] output; delete[] output;
} }
} while (!done && !stopRequested()); } while (!done && !stopRequested());

1
src/plugins/qt4projectmanager/qt-maemo/qt-maemo.pri
View File

@@ -6,7 +6,6 @@ SUPPORT_QT_MAEMO = $$(QTCREATOR_WITH_MAEMO)
# INCLUDEPATH += $$PWD/../../../libs/3rdparty/net7ssh/src # INCLUDEPATH += $$PWD/../../../libs/3rdparty/net7ssh/src
# INCLUDEPATH += $$PWD/../../../libs/3rdparty/botan/build # INCLUDEPATH += $$PWD/../../../libs/3rdparty/botan/build
# LIBS += -l$$qtLibraryTarget(Net7ssh) -l$$qtLibraryTarget(Botan) # LIBS += -l$$qtLibraryTarget(Net7ssh) -l$$qtLibraryTarget(Botan)
HEADERS += $$PWD/maemorunconfiguration.h \ HEADERS += $$PWD/maemorunconfiguration.h \
$$PWD/maemomanager.h \ $$PWD/maemomanager.h \
$$PWD/maemotoolchain.h \ $$PWD/maemotoolchain.h \