Merge branch 'windows_r_r_n_fix' of https://github.com/juj/emscripten into incoming

Author: kripken

src/jsifier.js

@@ -87,7 +87,10 @@ function JSify(data, functionsOnly) {
   }
 
   function processLibraryFunction(snippet, ident, finalName) {
-    snippet = snippet.toString();
+    // It is possible that when printing the function as a string on Windows, the js interpreter we are in returns the string with Windows
+    // line endings \r\n. This is undesirable, since line endings are managed in the form \n in the output for binary file writes, so
+    // make sure the endings are uniform.
+    snippet = snippet.toString().replace(/\r\n/gm,"\n");
     assert(snippet.indexOf('XXX missing C define') == -1,
            'Trying to include a library function with missing C defines: ' + finalName + ' | ' + snippet);
 

tools/line_endings.py

@@ -13,8 +13,13 @@ def check_line_endings(filename, print_errors=True):
     if print_errors: print >> sys.stderr, "Unable to read file '" + filename + "', or file was empty!"
     return 1
 
-  if "\r\r\n" in data:
-    if print_errors: print >> sys.stderr, "File '" + filename + "' contains BAD line endings of form \\r\\r\\n!"
+  bad_line_ending_index = data.find("\r\r\n")
+  if bad_line_ending_index != -1:
+    if print_errors:
+      print >> sys.stderr, "File '" + filename + "' contains BAD line endings of form \\r\\r\\n!"
+      bad_line = data[max(0,bad_line_ending_index-50):min(len(data), bad_line_ending_index+50)]
+      bad_line = bad_line.replace('\r', '\\r').replace('\n', '\\n')
+      print >> sys.stderr, "Content around the location: '" + bad_line + "'"
     return 1 # Bad line endings in file, return a non-zero process exit code.
 
   has_dos_line_endings = False