Tolerate carriage return in config files

If the file has been transferred from a Windows system then it might
have \r\n line endings instead of \n. Make sure this doesn't leak in to
the parameter values.

diff --git a/vncviewer/parameters.cxx b/vncviewer/parameters.cxx
index a4e18363133c1fdb83fad5ed0668c874e5d39bef..8db714ae25b818420e2f4f9542dda3f8bad10514 100644 (file)
--- a/vncviewer/parameters.cxx
+++ b/vncviewer/parameters.cxx
@@ -776,6 +776,10 @@ char* loadViewerParameters(const char *filename) {
       line[len-1] = '\0';
       len--;
     }
+    if (line[len-1] == '\r') {
+      line[len-1] = '\0';
+      len--;
+    }
 
     // Find the parameter value
     char *value = strchr(line, '=');