[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kpty
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2008-11-30 13:16:51
Message-ID: 1228051011.936708.26586.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 890838 by ossi:

wiggle


 M  +3 -2      kptydevice.cpp  


--- trunk/KDE/kdelibs/kpty/kptydevice.cpp #890837:890838
@@ -280,9 +280,9 @@
         if (!available) {
             char c;
             // Read the 0-byte STREAMS message
-            int r = read(q->masterFd(), &c, 0);
+            NO_INTR(readBytes, read(q->masterFd(), &c, 0));
             // Should return 0 bytes read; -1 is error
-            if (r < 0) {
+            if (readBytes < 0) {
                 readNotifier->setEnabled(false);
                 emit q->readEof();
                 return false;
@@ -294,6 +294,7 @@
         char *ptr = readBuffer.reserve(available);
         NO_INTR(readBytes, read(q->masterFd(), ptr, available));
         if (readBytes < 0) {
+            readBuffer.unreserve(available);
             q->setErrorString(I18N_NOOP("Error reading from PTY"));
             return false;
         }
[prev in list] [next in list] [prev in thread] [next in thread]