Make sure trailing whitespace is trimmed from log messages

Signed-off-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/src/xeniface/ioctls.c b/src/xeniface/ioctls.c
index ca2cf1cc2970b4d378b0daa71b0cf565d6c74bdf..e47ef6eb72f4fe27c0e4c0d1800f8cdb05ec2a62 100644 (file)
--- a/src/xeniface/ioctls.c
+++ b/src/xeniface/ioctls.c
@@ -123,11 +123,14 @@ IoctlLog(
     if (!__IsValidStr(Buffer, InLen))
         goto fail2;
 
-       // remove newlines from end of buffer
-       for (ptr = Buffer + InLen - 1;
-                ptr != Buffer && *ptr != 0 && *ptr != '\n';
-                --ptr)
-                       *ptr = 0;
+       // remove whitespace from end of buffer
+       for (ptr = Buffer + InLen - 1; ptr != Buffer; --ptr) {
+        if (*ptr != '\n' && *ptr != '\r' && *ptr != '\0')
+            break;
+
+        *ptr = '\0';
+    }
+
     XenIfaceDebugPrint(INFO, "USER: %s\n", Buffer);
     return STATUS_SUCCESS;