diff options
| author | Simon McVittie <smcv@debian.org> | 2014-04-30 20:16:11 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2014-04-30 20:16:11 +0100 |
| commit | 56b80e4831471edfa3edcfd114374016941ed52e (patch) | |
| tree | b5f7e507ad5c2d6e1263e5870d4d41ccefdfc9ca /test | |
| parent | a6267bcc65083d8460e42992acf1d6eeda9aab93 (diff) | |
| parent | 789800af438ae1f43b8fdcc1f81874e6ea8b49d0 (diff) | |
| download | dbus-56b80e4831471edfa3edcfd114374016941ed52e.tar.gz | |
Imported Upstream version 1.8.2upstream/1.8.2
Diffstat (limited to 'test')
| -rw-r--r-- | test/dbus-daemon-eavesdrop.c | 2 | ||||
| -rw-r--r-- | test/dbus-daemon.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/test/dbus-daemon-eavesdrop.c b/test/dbus-daemon-eavesdrop.c index bc5ba121..a78d8888 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 c883425e..4b3b61e5 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; } |