From 1e664b94467a65841e63d2dea50cd1f64e8a3258 Mon Sep 17 00:00:00 2001
From: Xavier Leroy <xavier.leroy@inria.fr>
Date: Wed, 3 Sep 1997 14:38:02 +0000
Subject: Implementation du type file_descr par le type HANDLE de Win32.
Court-circuite la libc de MSVC.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1700 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
otherlibs/win32unix/unix.ml | 38 +++++++++++++++++++++++++++-----------
1 file changed, 27 insertions(+), 11 deletions(-)
(limited to 'otherlibs/win32unix/unix.ml')
diff --git a/otherlibs/win32unix/unix.ml b/otherlibs/win32unix/unix.ml
index 5fa71cec9..b7d649b66 100644
--- a/otherlibs/win32unix/unix.ml
+++ b/otherlibs/win32unix/unix.ml
@@ -125,7 +125,7 @@ type wait_flag =
WNOHANG
| WUNTRACED
-type file_descr = int
+type file_descr
external execv : string -> string array -> unit = "unix_execv"
external execve : string -> string array -> string array -> unit = "unix_execve"
@@ -135,9 +135,11 @@ external waitpid : wait_flag list -> int -> int * process_status
= "win_waitpid"
external getpid : unit -> int = "unix_getpid"
-let stdin = 0
-let stdout = 1
-let stderr = 2
+external stdhandle : int -> file_descr = "win_stdhandle"
+
+let stdin = stdhandle 0
+let stdout = stdhandle 1
+let stderr = stdhandle 2
type open_flag =
O_RDONLY
@@ -170,13 +172,27 @@ let write fd buf ofs len =
then invalid_arg "Unix.write"
else unsafe_write fd buf ofs len
-external in_channel_of_descr : file_descr -> in_channel
- = "caml_open_descriptor"
-external out_channel_of_descr : file_descr -> out_channel
- = "caml_open_descriptor"
-external descr_of_in_channel : in_channel -> file_descr = "channel_descriptor"
-external descr_of_out_channel : out_channel -> file_descr
- = "channel_descriptor"
+external open_read_descriptor : int -> in_channel = "caml_open_descriptor"
+external open_write_descriptor : int -> out_channel = "caml_open_descriptor"
+external fd_of_in_channel : in_channel -> file_descr = "channel_descriptor"
+external fd_of_out_channel : out_channel -> file_descr = "channel_descriptor"
+
+external open_handle : file_descr -> open_flags list -> int = "win_fd_handle"
+external filedescr_of_fd : int -> file_descr = "win_handle_fd"
+
+let in_channel_of_descr_gen flags handle =
+ open_read_descriptor(open_handle handle flags)
+let in_channel_of_descr handle = in_channel_of_descr_gen [O_TEXT]
+
+let out_channel_of_descr_gen flags handle =
+ open_write_descriptor(open_handle handle flags)
+let out_channel_of_descr handle = out_channel_of_descr_gen [O_TEXT]
+
+let descr_of_in_channel inchan =
+ filedescr_of_fd(fd_of_in_channel inchan)
+
+let descr_of_out_channel outchan =
+ filedescr_of_fd(fd_of_out_channel outchan)
type seek_command =
SEEK_SET
--
cgit v1.2.3-70-g09d2