From: Руслан Ижбулатов <lrn1986@gmail.com>
Date: Sat, 8 Mar 2014 04:18:43 +0000 (+0000)
Subject: Handle 0x0d0a EOLs in spawn_dbus_daemon()
X-Git-Tag: dbus-1.8.2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28812c885f0b75fa9b2f6094534b85846fcd2cf4;p=thirdparty%2Fdbus.git

Handle 0x0d0a EOLs in spawn_dbus_daemon()

On W32 dbus daemon will print output in text mode, with 0x0d0a EOLs instead
of just 0x0a. Be able to handle that.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75863
Reviewed-by: Simon McVittie
---

diff --git a/test/dbus-daemon-eavesdrop.c b/test/dbus-daemon-eavesdrop.c
index bc5ba1211..a78d88887 100644
--- a/test/dbus-daemon-eavesdrop.c
+++ b/test/dbus-daemon-eavesdrop.c
@@ -151,6 +151,8 @@ spawn_dbus_daemon (gchar *binary,
 
       if (newline != NULL)
         {
+          if ((newline > address->str) && ('\r' == newline[-1]))
+            newline -= 1;
           g_string_truncate (address, newline - address->str);
           break;
         }
diff --git a/test/dbus-daemon.c b/test/dbus-daemon.c
index c883425ed..4b3b61e54 100644
--- a/test/dbus-daemon.c
+++ b/test/dbus-daemon.c
@@ -119,6 +119,8 @@ spawn_dbus_daemon (gchar *binary,
 
       if (newline != NULL)
         {
+          if ((newline > address->str) && ('\r' == newline[-1]))
+            newline -= 1;
           g_string_truncate (address, newline - address->str);
           break;
         }