diff options
Diffstat (limited to 'kioslave')
| -rw-r--r-- | kioslave/sftp/ksshprocess.cpp | 20 |
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); + } } } |