Skip to content

CA-211448: When reading a line from sysfs, translate End_of_file to "" #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 19, 2016
Merged

CA-211448: When reading a line from sysfs, translate End_of_file to "" #79

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d19b6ea
CA-211448: When reading a line from sysfs, translate End_of_file to ""
robhoes May 19, 2016
7d613a7
fixup! CA-211448: When reading a line from sysfs, translate End_of_fi…
robhoes May 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions lib/network_utils.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,14 @@ module Sysfs = struct
Printf.sprintf "/sys/class/net/%s/%s" dev attr

let read_one_line file =
let inchan = open_in file in
try
let result = input_line inchan in
close_in inchan;
result
with exn -> close_in inchan; raise (Read_error file)
let inchan = open_in file in
finally
(fun () -> input_line inchan)
(fun () -> close_in inchan)
with
| End_of_file -> ""
| exn -> error "%s" (Printexc.to_string exn); raise (Read_error file)

let write_one_line file l =
let outchan = open_out file in
Expand Down