From e9cd8ef01fe5b9ffc3e85984d0f9bc410a56f8ea Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Mon, 11 Sep 2017 16:22:51 +0200
Subject: A possible fix for BZ#5715 (escape non-utf8 win32 file names).

On Win32, Sys.readdir translates the file names to the charset of the
local "code page", which may be not compatible with utf8.

Warnings referring to these names can be generated. These warnings may
be sent to CoqIDE. To ensure a utf8 compliant communication, we escape
non-utf8 file names under win32.

In the CoqIDE/Coq communication, Glib.IO.read_chars expects an
utf8-encoding and raises otherwise a Glib.Error "Invalid byte sequence in
conversion input".

This fixes bug #5715 (Hangul characters not recognized in file names)
but this does not solve the case of an operating system mounting a
file system with a different coding convention than the default one,
i.e. unicode using "Normalization Form Canonical Decomposition" in
UTF-8 for HFS+ on MacOS X, no encoding for ext3/ext4 on Linux,
(non-normalized?) UTF-16 for NTFS on Windows.
---
 lib/system.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/system.ml')

diff --git a/lib/system.ml b/lib/system.ml
index 12eacf2eaf..0b64b237da 100644
--- a/lib/system.ml
+++ b/lib/system.ml
@@ -52,7 +52,7 @@ let dirmap = ref StrMap.empty
 
 let make_dir_table dir =
   let filter_dotfiles s f = if f.[0] = '.' then s else StrSet.add f s in
-  Array.fold_left filter_dotfiles StrSet.empty (readdir dir)
+  Array.fold_left filter_dotfiles StrSet.empty (Sys.readdir dir)
 
 let exists_in_dir_respecting_case dir bf =
   let cache_dir dir =
-- 
cgit v1.2.3