diff --git a/Makefile b/Makefile index be5431b499e57fd2a491e4d5e02f4f83a220b2b7..ff3df25fdd32eb6e4675812f9234c436988633be 100644 --- a/Makefile +++ b/Makefile @@ -2151,9 +2151,9 @@ CHECK_NEWLINES:=./bin/check_newlines$(EXE) $(CHECK_NEWLINES): bin/check_newlines.ml $(PRINT_MAKING) $@ ifeq ($(OCAMLBEST),opt) - $(OCAMLOPT) str.cmxa unix.cmxa $< -o $@ + $(OCAMLOPT) unix.cmxa $< -o $@ else - $(OCAMLC) str.cma unix.cma $< -o $@ + $(OCAMLC) unix.cma $< -o $@ endif check-newlines-clean: @@ -2166,9 +2166,9 @@ ISUTF8:=./bin/isutf8$(EXE) $(ISUTF8): bin/isutf8.ml $(PRINT_MAKING) $@ ifeq ($(OCAMLBEST),opt) - $(OCAMLOPT) str.cmxa $< -o $@ + $(OCAMLOPT) $< -o $@ else - $(OCAMLC) str.cma $< -o $@ + $(OCAMLC) $< -o $@ endif isutf8-clean: diff --git a/bin/check_newlines.ml b/bin/check_newlines.ml index b2166d668d639dc8746cbb2fd443b277dd849f9e..4524bdc80d9d1e14edd919acb4de2e4db746a7eb 100644 --- a/bin/check_newlines.ml +++ b/bin/check_newlines.ml @@ -1,17 +1,5 @@ module StringSet = Set.Make(String) -let unquote_filename filename = - let n = String.length filename in - let r = - if n > 1 && String.get filename 0 = '"' && - String.get filename (n - 1) = '"' - then - String.sub filename 1 (n-2) - else - filename - in - Str.global_replace (Str.regexp "\\\\") "" r - (* returns true for empty files *) let is_last_byte_newline filename = try @@ -51,13 +39,6 @@ let () = try while true; do let filename = input_line file_list_ic in - let filename = - (* assume no empty filenames *) - if String.get filename 0 = '"' then - unquote_filename filename - else - filename - in if not (StringSet.mem filename to_ignore) && not (is_last_byte_newline filename) then begin incr errors; diff --git a/bin/isutf8.ml b/bin/isutf8.ml index 3e3ddef4e6e75ad9dee3009b06ffa1e925eb4254..5950a0c6b826126676304be8212ae28b53c0cfdb 100644 --- a/bin/isutf8.ml +++ b/bin/isutf8.ml @@ -1,17 +1,5 @@ module StringSet = Set.Make(String) -let unquote_filename filename = - let n = String.length filename in - let r = - if n > 1 && String.get filename 0 = '"' && - String.get filename (n - 1) = '"' - then - String.sub filename 1 (n-2) - else - filename - in - Str.global_replace (Str.regexp "\\\\") "" r - exception False let is_valid_utf8 filename = @@ -71,13 +59,6 @@ let () = try while true; do let filename = input_line file_list_ic in - let filename = - (* assume no empty filenames *) - if String.get filename 0 = '"' then - unquote_filename filename - else - filename - in if not (StringSet.mem filename to_ignore) && not (is_valid_utf8 filename) then begin incr errors;