From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 25 Jul 2013 10:03:29 +0000 (+0200)
Subject: qemumonitortestutils: Split lines on \n instead of \r\n
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f6bb917e6acfeb98f83d305dd40b6b7a45a3c5e1;p=people%2Fdariof%2Flibvirt.git

qemumonitortestutils: Split lines on \n instead of \r\n

The normal monitor uses windows line endings, where the agent monitor
uses only newlines. Change this to tolerate both approaches and allow to
use the utilities for guest agent tests.
---

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index e02245de3..00ac0c6a7 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -201,7 +201,7 @@ qemuMonitorTestIO(virNetSocketPtr sock,
          * if so, handle that command
          */
         t1 = test->incoming;
-        while ((t2 = strstr(t1, "\r\n"))) {
+        while ((t2 = strstr(t1, "\n"))) {
             *t2 = '\0';
 
             if (qemuMonitorTestProcessCommand(test, t1) < 0) {
@@ -209,7 +209,7 @@ qemuMonitorTestIO(virNetSocketPtr sock,
                 goto cleanup;
             }
 
-            t1 = t2 + 2;
+            t1 = t2 + 1;
         }
         used = t1 - test->incoming;
         memmove(test->incoming, t1, test->incomingLength - used);