summaryrefslogtreecommitdiffstats
path: root/kioslave
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-23 02:41:47 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-04-23 02:41:47 -0500
commite72f4926c094b2bd94501518fbcd2a3e66a74f6a (patch)
tree54c157153c3681f10ddcbead407bff8b32b8ef16 /kioslave
parent50739c9ba4737317108da68c148472c3da856c95 (diff)
downloadtdebase-e72f4926c094b2bd94501518fbcd2a3e66a74f6a.tar.gz
tdebase-e72f4926c094b2bd94501518fbcd2a3e66a74f6a.zip
Fix sftp failure on newer systems
This closes Bug 897
Diffstat (limited to 'kioslave')
-rw-r--r--kioslave/sftp/ksshprocess.cpp20
1 files changed, 15 insertions, 5 deletions
diff --git a/kioslave/sftp/ksshprocess.cpp b/kioslave/sftp/ksshprocess.cpp
index 2ccab59b7..3393f8934 100644
--- a/kioslave/sftp/ksshprocess.cpp
+++ b/kioslave/sftp/ksshprocess.cpp
@@ -569,7 +569,9 @@ TQString KSshProcess::getLine() {
// If we still don't have anything in our buffer so there must
// not be anything on the pty or stderr. Setup a select()
// to wait for some data from SSH.
- if( buffer.empty() ) {
+ // Hack around select() failure on newer systems
+ unsigned long milliseconds = 0;
+ while ((buffer.size() == 0) && (milliseconds < (60*1000))) {
//kdDebug(KSSHPROC) << "KSshProcess::getLine(): " <<
// "Line buffer empty, calling select() to wait for data." << endl;
int errfd = ssh.stderrFd();
@@ -616,14 +618,18 @@ TQString KSshProcess::getLine() {
// had data on it first.
if( FD_ISSET(ptyfd, &rfds) ) {
ptyLine = ssh.readLineFromPty(false);
- buffer.prepend(TQString(ptyLine));
+ if (ptyLine.size() > 0) {
+ buffer.prepend(TQString(ptyLine));
+ }
//kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
// "line from pty -" << ptyLine << endl;
}
-
+
if( FD_ISSET(errfd, &rfds) ) {
errLine = ssh.readLineFromStderr(false);
- buffer.prepend(TQString(errLine));
+ if (errLine.size() > 0) {
+ buffer.prepend(TQString(errLine));
+ }
//kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
// "line from err -" << errLine << endl;
}
@@ -637,7 +643,11 @@ TQString KSshProcess::getLine() {
kdDebug(KSSHPROC) << "KSshProcess::getLine(): "
"Exception on std err file descriptor." << endl;
}
-
+
+ if (buffer.size() == 0) {
+ milliseconds++;
+ usleep(1000);
+ }
}
}