Changeset 1045 for trunk/tools/assistant

Timestamp:

Sep 2, 2011, 2:18:55 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Fix Qt Assistant remote control.

The commands were only processed if terminated with '\0' while
'\n' should also be interpreted as a terminator. This is an r701
regression.

File:

• trunk/tools/assistant/tools/assistant/remotecontrol.cpp (modified) (3 diffs)

trunk/tools/assistant/tools/assistant/remotecontrol.cpp

@@ -86 +86 @@
     TRACE_OBJ
     char chBuf[4096];
-    size_t pos = 0;
     ULONG ulRead;
+
 
     HFILE hStdinDup = HFILE(~0);
@@ -94 +94 @@
 
     while (arc == NO_ERROR) {
-        arc = DosRead(hStdinDup, chBuf + pos, sizeof(chBuf) - pos, &ulRead);
+        arc = DosRead(hStdinDup, chBuf, &ulRead);
         if (arc == NO_ERROR && ulRead != 0) {
-            size_t totalRead = pos + ulRead;
-            size_t len = ulRead;
-            char *start = chBuf, *zero = chBuf + pos;
-            // send all complete commands
-            while (len && (zero = static_cast<char *>(memchr(zero, '\0', len)))) {
-                emit receivedCommand(QString::fromLocal8Bit(start));
-                start = ++zero;
-                len = totalRead - (start - chBuf);
+            
+            ;
+            ;
+            
+            
+                ;
+                
+                ;
             }
-            if (start != chBuf) {
-                // move the incomplete portion to the beginning
-                memcpy(chBuf, start, len);
-                pos = len;
-            } else {
-                pos = totalRead;
-                if (pos == sizeof(chBuf)) {
-                    // buffer full, emit the command anyway and start over
-                    QByteArray cmd(chBuf, sizeof(chBuf));
-                    emit receivedCommand(QString::fromLocal8Bit(cmd));
-                    pos = 0;
-                }
+            cmd.append(chBuf, i);
+            if (gotIt) {
+                emit receivedCommand(QString::fromLocal8Bit(cmd));
+                cmd.clear();
+                // get the remains if any
+                cmd.append(chBuf + i, ulRead - i);
             }
         }
@@ -149 +143 @@
     hStdinDup = stdin;
 #endif
-
-    // ### do the same as in the OS/2 version above
 
     while (ok) {