#247: cope with settings-as-files having been dos2unix'd

FauxFaux · Jun 27, 2016 · c2f5eb7 · c2f5eb7
1 parent 5d77a13
commit c2f5eb7
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/windows/winstore.c b/windows/winstore.c
@@ -1060,6 +1060,12 @@ void *file_open_settings_r(const char *sessionname)
             if (!p) break;
             *p = '\0';
             ++p;
+
+            // allow for someone having dos2unix'd our file
+            if (*p == '\r')
+                ++p;
+
+            assert('\n' == *p);
             ++p; /* for "\\\n" - human readable files */
 
             st2 = snew( struct setItem );