Changeset 701

Timestamp:

Mar 18, 2010, 3:54:07 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

tools/assistant: Fixed: Would only recognize the first of two or more commands read in one batch in remote control mode [kind of vendor bug].

File:

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

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

@@ -79 +79 @@
 {
     char chBuf[4096];
+    size_t pos = 0;
     ULONG ulRead;
 
@@ -86 +87 @@
 
     while (arc == NO_ERROR) {
-        arc = DosRead(hStdinDup, chBuf, sizeof(chBuf), &ulRead);
-        if (arc == NO_ERROR && ulRead != 0)
-            emit receivedCommand(QString::fromLocal8Bit(chBuf));
+        arc = DosRead(hStdinDup, chBuf + pos, sizeof(chBuf) - pos, &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;
+                }
+            }
+        }
     }
 
@@ -118 +141 @@
     hStdinDup = stdin;
 #endif
+
+    // ### do the same as in the OS/2 version above
 
     while (ok) {