@@ -15,7 +15,7 @@ use shims::time::system_time_to_duration;
15
15
#[ derive( Debug ) ]
16
16
pub struct FileHandle {
17
17
file : File ,
18
- read_only : bool ,
18
+ writable : bool ,
19
19
}
20
20
21
21
pub struct FileHandler {
@@ -57,13 +57,13 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
57
57
if ( o_rdonly | o_wronly | o_rdwr) & !0b11 != 0 {
58
58
throw_unsup_format ! ( "Access mode flags on this platform are unsupported" ) ;
59
59
}
60
- let mut read_only = false ;
60
+ let mut writable = true ;
61
61
62
62
// Now we check the access mode
63
63
let access_mode = flag & 0b11 ;
64
64
65
65
if access_mode == o_rdonly {
66
- read_only = true ;
66
+ writable = false ;
67
67
options. read ( true ) ;
68
68
} else if access_mode == o_wronly {
69
69
options. write ( true ) ;
@@ -109,7 +109,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
109
109
let fd = options. open ( & path) . map ( |file| {
110
110
let mut fh = & mut this. machine . file_handler ;
111
111
fh. low += 1 ;
112
- fh. handles . insert ( fh. low , FileHandle { file, read_only } ) . unwrap_none ( ) ;
112
+ fh. handles . insert ( fh. low , FileHandle { file, writable } ) . unwrap_none ( ) ;
113
113
fh. low
114
114
} ) ;
115
115
@@ -153,7 +153,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
153
153
154
154
if let Some ( handle) = this. machine . file_handler . handles . remove ( & fd) {
155
155
// We sync the file if it was opened in a mode different than read-only.
156
- if ! handle. read_only {
156
+ if handle. writable {
157
157
// `File::sync_all` does the checks that are done when closing a file. We do this to
158
158
// to handle possible errors correctly.
159
159
let result = this. try_unwrap_io_result ( handle. file . sync_all ( ) . map ( |_| 0i32 ) ) ;
@@ -164,7 +164,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
164
164
} else {
165
165
// We drop the file, this closes it but ignores any errors produced when closing
166
166
// it. This is done because `File::sync_call` cannot be done over files like
167
- // `/dev/urandom`. Check
167
+ // `/dev/urandom` which are read-only . Check
168
168
// https://github.com/rust-lang/miri/issues/999#issuecomment-568920439 for a deeper
169
169
// discussion.
170
170
drop ( handle) ;
0 commit comments