windows: Strip CR/LF from end of system error messages.

This fixes bug #585.

diff --git a/serialport.c b/serialport.c
index e4f02fc58dde6d1cde27f5863eff49dae0f326e2..aaa609545b20675343b7445fd2e0ccc9716d4b2b 100644 (file)
--- a/serialport.c
+++ b/serialport.c
@@ -2287,10 +2287,10 @@ SP_API char *sp_last_error_message(void)
        TRACE_VOID();
 
 #ifdef _WIN32
-       LPVOID message;
+       TCHAR *message;
        DWORD error = GetLastError();
 
-       FormatMessage(
+       DWORD length = FormatMessage(
                FORMAT_MESSAGE_ALLOCATE_BUFFER |
                FORMAT_MESSAGE_FROM_SYSTEM |
                FORMAT_MESSAGE_IGNORE_INSERTS,
@@ -2300,6 +2300,9 @@ SP_API char *sp_last_error_message(void)
                (LPTSTR) &message,
                0, NULL );
 
+       if (length >= 2 && message[length - 2] == '\r')
+               message[length - 2] = '\0';
+
        RETURN_STRING(message);
 #else
        RETURN_STRING(strerror(errno));