@@ -907,35 +907,35 @@ pub const Dir = struct {
907907 return self .openFileW (path_w .span (), flags );
908908 }
909909
910- var os_flags : u32 = os .O_CLOEXEC ;
910+ var os_flags : u32 = os .O . CLOEXEC ;
911911 // Use the O_ locking flags if the os supports them to acquire the lock
912912 // atomically.
913- const has_flock_open_flags = @hasDecl (os , "O_EXLOCK " );
913+ const has_flock_open_flags = @hasDecl (os . O , "EXLOCK " );
914914 if (has_flock_open_flags ) {
915915 // Note that the O_NONBLOCK flag is removed after the openat() call
916916 // is successful.
917917 const nonblocking_lock_flag : u32 = if (flags .lock_nonblocking )
918- os .O_NONBLOCK
918+ os .O . NONBLOCK
919919 else
920920 0 ;
921921 os_flags |= switch (flags .lock ) {
922922 .None = > @as (u32 , 0 ),
923- .Shared = > os .O_SHLOCK | nonblocking_lock_flag ,
924- .Exclusive = > os .O_EXLOCK | nonblocking_lock_flag ,
923+ .Shared = > os .O . SHLOCK | nonblocking_lock_flag ,
924+ .Exclusive = > os .O . EXLOCK | nonblocking_lock_flag ,
925925 };
926926 }
927- if (@hasDecl (os , "O_LARGEFILE " )) {
928- os_flags |= os .O_LARGEFILE ;
927+ if (@hasDecl (os . O , "LARGEFILE " )) {
928+ os_flags |= os .O . LARGEFILE ;
929929 }
930930 if (! flags .allow_ctty ) {
931- os_flags |= os .O_NOCTTY ;
931+ os_flags |= os .O . NOCTTY ;
932932 }
933933 os_flags |= if (flags .write and flags .read )
934- @as (u32 , os .O_RDWR )
934+ @as (u32 , os .O . RDWR )
935935 else if (flags .write )
936- @as (u32 , os .O_WRONLY )
936+ @as (u32 , os .O . WRONLY )
937937 else
938- @as (u32 , os .O_RDONLY );
938+ @as (u32 , os .O . RDONLY );
939939 const fd = if (flags .intended_io_mode != .blocking )
940940 try std .event .Loop .instance .? .openatZ (self .fd , sub_path , os_flags , 0 )
941941 else
@@ -947,11 +947,11 @@ pub const Dir = struct {
947947 if (builtin .target .os .tag != .wasi ) {
948948 if (! has_flock_open_flags and flags .lock != .None ) {
949949 // TODO: integrate async I/O
950- const lock_nonblocking = if (flags .lock_nonblocking ) os .LOCK_NB else @as (i32 , 0 );
950+ const lock_nonblocking = if (flags .lock_nonblocking ) os .LOCK . NB else @as (i32 , 0 );
951951 try os .flock (fd , switch (flags .lock ) {
952952 .None = > unreachable ,
953- .Shared = > os .LOCK_SH | lock_nonblocking ,
954- .Exclusive = > os .LOCK_EX | lock_nonblocking ,
953+ .Shared = > os .LOCK . SH | lock_nonblocking ,
954+ .Exclusive = > os .LOCK . EX | lock_nonblocking ,
955955 });
956956 }
957957 }
@@ -963,7 +963,7 @@ pub const Dir = struct {
963963 error .PermissionDenied = > unreachable ,
964964 else = > | e | return e ,
965965 };
966- fl_flags &= ~ @as (usize , os .O_NONBLOCK );
966+ fl_flags &= ~ @as (usize , os .O . NONBLOCK );
967967 _ = os .fcntl (fd , os .F_SETFL , fl_flags ) catch | err | switch (err ) {
968968 error .FileBusy = > unreachable ,
969969 error .Locked = > unreachable ,
@@ -1038,7 +1038,7 @@ pub const Dir = struct {
10381038 /// Same as `createFile` but WASI only.
10391039 pub fn createFileWasi (self : Dir , sub_path : []const u8 , flags : File.CreateFlags ) File.OpenError ! File {
10401040 const w = os .wasi ;
1041- var oflags = w .O_CREAT ;
1041+ var oflags = w .O . CREAT ;
10421042 var base : w.rights_t = w .RIGHT_FD_WRITE |
10431043 w .RIGHT_FD_DATASYNC |
10441044 w .RIGHT_FD_SEEK |
@@ -1054,10 +1054,10 @@ pub const Dir = struct {
10541054 base |= w .RIGHT_FD_READ ;
10551055 }
10561056 if (flags .truncate ) {
1057- oflags |= w .O_TRUNC ;
1057+ oflags |= w .O . TRUNC ;
10581058 }
10591059 if (flags .exclusive ) {
1060- oflags |= w .O_EXCL ;
1060+ oflags |= w .O . EXCL ;
10611061 }
10621062 const fd = try os .openatWasi (self .fd , sub_path , 0x0 , oflags , 0x0 , base , 0x0 );
10631063 return File { .handle = fd };
@@ -1072,24 +1072,24 @@ pub const Dir = struct {
10721072
10731073 // Use the O_ locking flags if the os supports them to acquire the lock
10741074 // atomically.
1075- const has_flock_open_flags = @hasDecl (os , "O_EXLOCK " );
1075+ const has_flock_open_flags = @hasDecl (os . O , "EXLOCK " );
10761076 // Note that the O_NONBLOCK flag is removed after the openat() call
10771077 // is successful.
10781078 const nonblocking_lock_flag : u32 = if (has_flock_open_flags and flags .lock_nonblocking )
1079- os .O_NONBLOCK
1079+ os .O . NONBLOCK
10801080 else
10811081 0 ;
10821082 const lock_flag : u32 = if (has_flock_open_flags ) switch (flags .lock ) {
10831083 .None = > @as (u32 , 0 ),
1084- .Shared = > os .O_SHLOCK | nonblocking_lock_flag ,
1085- .Exclusive = > os .O_EXLOCK | nonblocking_lock_flag ,
1084+ .Shared = > os .O . SHLOCK | nonblocking_lock_flag ,
1085+ .Exclusive = > os .O . EXLOCK | nonblocking_lock_flag ,
10861086 } else 0 ;
10871087
1088- const O_LARGEFILE = if (@hasDecl (os , "O_LARGEFILE " )) os .O_LARGEFILE else 0 ;
1089- const os_flags = lock_flag | O_LARGEFILE | os .O_CREAT | os .O_CLOEXEC |
1090- (if (flags .truncate ) @as (u32 , os .O_TRUNC ) else 0 ) |
1091- (if (flags .read ) @as (u32 , os .O_RDWR ) else os .O_WRONLY ) |
1092- (if (flags .exclusive ) @as (u32 , os .O_EXCL ) else 0 );
1088+ const O_LARGEFILE = if (@hasDecl (os . O , "LARGEFILE " )) os .O . LARGEFILE else 0 ;
1089+ const os_flags = lock_flag | O_LARGEFILE | os .O . CREAT | os .O . CLOEXEC |
1090+ (if (flags .truncate ) @as (u32 , os .O . TRUNC ) else 0 ) |
1091+ (if (flags .read ) @as (u32 , os .O . RDWR ) else os .O . WRONLY ) |
1092+ (if (flags .exclusive ) @as (u32 , os .O . EXCL ) else 0 );
10931093 const fd = if (flags .intended_io_mode != .blocking )
10941094 try std .event .Loop .instance .? .openatZ (self .fd , sub_path_c , os_flags , flags .mode )
10951095 else
@@ -1101,11 +1101,11 @@ pub const Dir = struct {
11011101 if (builtin .target .os .tag != .wasi ) {
11021102 if (! has_flock_open_flags and flags .lock != .None ) {
11031103 // TODO: integrate async I/O
1104- const lock_nonblocking = if (flags .lock_nonblocking ) os .LOCK_NB else @as (i32 , 0 );
1104+ const lock_nonblocking = if (flags .lock_nonblocking ) os .LOCK . NB else @as (i32 , 0 );
11051105 try os .flock (fd , switch (flags .lock ) {
11061106 .None = > unreachable ,
1107- .Shared = > os .LOCK_SH | lock_nonblocking ,
1108- .Exclusive = > os .LOCK_EX | lock_nonblocking ,
1107+ .Shared = > os .LOCK . SH | lock_nonblocking ,
1108+ .Exclusive = > os .LOCK . EX | lock_nonblocking ,
11091109 });
11101110 }
11111111 }
@@ -1117,7 +1117,7 @@ pub const Dir = struct {
11171117 error .PermissionDenied = > unreachable ,
11181118 else = > | e | return e ,
11191119 };
1120- fl_flags &= ~ @as (usize , os .O_NONBLOCK );
1120+ fl_flags &= ~ @as (usize , os .O . NONBLOCK );
11211121 _ = os .fcntl (fd , os .F_SETFL , fl_flags ) catch | err | switch (err ) {
11221122 error .FileBusy = > unreachable ,
11231123 error .Locked = > unreachable ,
@@ -1262,7 +1262,7 @@ pub const Dir = struct {
12621262 return self .realpathW (pathname_w .span (), out_buffer );
12631263 }
12641264
1265- const flags = if (builtin .os .tag == .linux ) os .O_PATH | os .O_NONBLOCK | os .O_CLOEXEC else os .O_NONBLOCK | os .O_CLOEXEC ;
1265+ const flags = if (builtin .os .tag == .linux ) os .O . PATH | os .O . NONBLOCK | os .O . CLOEXEC else os .O . NONBLOCK | os .O . CLOEXEC ;
12661266 const fd = os .openatZ (self .fd , pathname , flags , 0 ) catch | err | switch (err ) {
12671267 error .FileLocksNotSupported = > unreachable ,
12681268 else = > | e | return e ,
@@ -1423,7 +1423,7 @@ pub const Dir = struct {
14231423 // TODO do we really need all the rights here?
14241424 const inheriting : w.rights_t = w .RIGHT_ALL ^ w .RIGHT_SOCK_SHUTDOWN ;
14251425
1426- const result = os .openatWasi (self .fd , sub_path , symlink_flags , w .O_DIRECTORY , 0x0 , base , inheriting );
1426+ const result = os .openatWasi (self .fd , sub_path , symlink_flags , w .O . DIRECTORY , 0x0 , base , inheriting );
14271427 const fd = result catch | err | switch (err ) {
14281428 error .FileTooBig = > unreachable , // can't happen for directories
14291429 error .IsDir = > unreachable , // we're providing O_DIRECTORY
@@ -1442,12 +1442,12 @@ pub const Dir = struct {
14421442 const sub_path_w = try os .windows .cStrToPrefixedFileW (sub_path_c );
14431443 return self .openDirW (sub_path_w .span ().ptr , args );
14441444 }
1445- const symlink_flags : u32 = if (args .no_follow ) os .O_NOFOLLOW else 0x0 ;
1445+ const symlink_flags : u32 = if (args .no_follow ) os .O . NOFOLLOW else 0x0 ;
14461446 if (! args .iterate ) {
1447- const O_PATH = if (@hasDecl (os , "O_PATH " )) os .O_PATH else 0 ;
1448- return self .openDirFlagsZ (sub_path_c , os .O_DIRECTORY | os .O_RDONLY | os .O_CLOEXEC | O_PATH | symlink_flags );
1447+ const O_PATH = if (@hasDecl (os . O , "PATH " )) os .O . PATH else 0 ;
1448+ return self .openDirFlagsZ (sub_path_c , os .O . DIRECTORY | os .O . RDONLY | os .O . CLOEXEC | O_PATH | symlink_flags );
14491449 } else {
1450- return self .openDirFlagsZ (sub_path_c , os .O_DIRECTORY | os .O_RDONLY | os .O_CLOEXEC | symlink_flags );
1450+ return self .openDirFlagsZ (sub_path_c , os .O . DIRECTORY | os .O . RDONLY | os .O . CLOEXEC | symlink_flags );
14511451 }
14521452 }
14531453
@@ -2132,7 +2132,7 @@ pub fn cwd() Dir {
21322132 } else if (builtin .os .tag == .wasi and ! builtin .link_libc ) {
21332133 @compileError ("WASI doesn't have a concept of cwd(); use std.fs.wasi.PreopenList to get available Dir handles instead" );
21342134 } else {
2135- return Dir { .fd = os .AT_FDCWD };
2135+ return Dir { .fd = os .AT . FDCWD };
21362136 }
21372137}
21382138
0 commit comments