1 files changed, 15 insertions, 2 deletions
diff --git a/tools/md5sum.ml b/tools/md5sum.ml
index d6cac9377..16bbdb579 100644
--- a/tools/md5sum.ml
+++ b/tools/md5sum.ml
@@ -1,8 +1,21 @@
+let get_content file =
+  let ic = open_in_bin file in
+  let buf = Buffer.create 2048 in
+  let rec fill () =
+    match input_char ic with
+    | '\r' -> fill () (* NOTE: handles the case on Windows where the
+                         git checkout has included return characters.
+                         See: https://github.com/coq/coq/pull/6305 *)
+    | c -> Buffer.add_char buf c; fill ()
+  in
+  try fill () with End_of_file -> Buffer.contents buf
+
 let () =
   match Sys.argv with
   | [|_; file|] ->
-      let md5 = Digest.to_hex (Digest.file file) in
-      print_endline (md5 ^ "  " ^ file)
+      let content = get_content file in
+      let md5 = Digest.to_hex (Digest.string content) in
+      print_string (md5 ^ " " ^ file)
   | _ ->
       prerr_endline "Error: This program needs exactly one parameter.";
       prerr_endline "Usage: ocaml md5sum.ml [FILE]";