github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

miragesdk: fail early on short read/write returning 0

Browse Source 
Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
This commit is contained in:
Thomas Gazagnaire 2017-04-04 11:44:23 +02:00
parent 25d3e42204
commit 0938ae44f6
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
projects/miragesdk/src/sdk/IO.ml
View File

@ -9,7 +9,8 @@ let rec really_write fd buf off len =
| len ->
Log.debug (fun l -> l "really_write off=%d len=%d" off len);
Lwt_unix.write fd buf off len >>= fun n ->
really_write fd buf (off+n) (len-n)
if n = 0 then Lwt.fail_with "write 0"
else really_write fd buf (off+n) (len-n)
let write fd buf = really_write fd buf 0 (String.length buf)
@ -19,7 +20,8 @@ let rec really_read fd buf off len =
| len ->
Log.debug (fun l -> l "really_read off=%d len=%d" off len);
Lwt_unix.read fd buf off len >>= fun n ->
really_read fd buf (off+n) (len-n)
if n = 0 then Lwt.fail_with "read 0"
else really_read fd buf (off+n) (len-n)
let read_all fd =
Log.debug (fun l -> l "read_all");
@ -27,6 +29,8 @@ let read_all fd =
let buf = Bytes.create len in
let rec loop acc =
Lwt_unix.read fd buf 0 len >>= fun n ->
if n = 0 then Lwt.fail_with "read 0"
else
let acc = String.sub buf 0 n :: acc in
if n <= len then Lwt.return (List.rev acc)
else loop acc
@ -39,6 +43,8 @@ let read_n fd len =
let buf = Bytes.create len in
let rec loop acc len =
Lwt_unix.read fd buf 0 len >>= fun n ->
if n = 0 then Lwt.fail_with "read 0"
else
let acc = String.sub buf 0 n :: acc in
match len - n with
| 0 -> Lwt.return (List.rev acc)