@@ -61,27 +61,28 @@ pub unsafe fn init(argc: isize, argv: *const *const u8, sigpipe: u8) {
61
61
}
62
62
63
63
unsafe fn sanitize_standard_fds ( ) {
64
- let mut opened_devnull = -1 ;
65
- let mut open_devnull = || {
66
- #[ cfg( not( all( target_os = "linux" , target_env = "gnu" ) ) ) ]
67
- use libc:: open as open64;
68
- #[ cfg( all( target_os = "linux" , target_env = "gnu" ) ) ]
69
- use libc:: open64;
70
-
71
- if opened_devnull != -1 {
72
- if libc:: dup ( opened_devnull) != -1 {
73
- return ;
64
+ macro_rules! open_devnull {
65
+ ( $opened_devnull: expr) => {
66
+ #[ cfg( not( all( target_os = "linux" , target_env = "gnu" ) ) ) ]
67
+ use libc:: open as open64;
68
+ #[ cfg( all( target_os = "linux" , target_env = "gnu" ) ) ]
69
+ use libc:: open64;
70
+
71
+ if $opened_devnull != -1 {
72
+ if libc:: dup( $opened_devnull) != -1 {
73
+ return ;
74
+ }
75
+ }
76
+ $opened_devnull = open64( c"/dev/null" . as_ptr( ) , libc:: O_RDWR , 0 ) ;
77
+ if $opened_devnull == -1 {
78
+ // If the stream is closed but we failed to reopen it, abort the
79
+ // process. Otherwise we wouldn't preserve the safety of
80
+ // operations on the corresponding Rust object Stdin, Stdout, or
81
+ // Stderr.
82
+ libc:: abort( ) ;
74
83
}
75
84
}
76
- opened_devnull = open64 ( c"/dev/null" . as_ptr ( ) , libc:: O_RDWR , 0 ) ;
77
- if opened_devnull == -1 {
78
- // If the stream is closed but we failed to reopen it, abort the
79
- // process. Otherwise we wouldn't preserve the safety of
80
- // operations on the corresponding Rust object Stdin, Stdout, or
81
- // Stderr.
82
- libc:: abort ( ) ;
83
- }
84
- } ;
85
+ }
85
86
86
87
// fast path with a single syscall for systems with poll()
87
88
#[ cfg( not( any(
@@ -99,6 +100,7 @@ pub unsafe fn init(argc: isize, argv: *const *const u8, sigpipe: u8) {
99
100
) ) ) ]
100
101
' poll: {
101
102
use crate :: sys:: os:: errno;
103
+ let mut opened_devnull = -1 ;
102
104
let pfds: & mut [ _ ] = & mut [
103
105
libc:: pollfd { fd : 0 , events : 0 , revents : 0 } ,
104
106
libc:: pollfd { fd : 1 , events : 0 , revents : 0 } ,
@@ -125,7 +127,7 @@ pub unsafe fn init(argc: isize, argv: *const *const u8, sigpipe: u8) {
125
127
if pfd. revents & libc:: POLLNVAL == 0 {
126
128
continue ;
127
129
}
128
- open_devnull ( ) ;
130
+ open_devnull ! ( opened_devnull ) ;
129
131
}
130
132
return ;
131
133
}
@@ -143,9 +145,10 @@ pub unsafe fn init(argc: isize, argv: *const *const u8, sigpipe: u8) {
143
145
) ) ) ]
144
146
{
145
147
use crate :: sys:: os:: errno;
148
+ let mut opened_devnull = -1 ;
146
149
for fd in 0 ..3 {
147
150
if libc:: fcntl ( fd, libc:: F_GETFD ) == -1 && errno ( ) == libc:: EBADF {
148
- open_devnull ( ) ;
151
+ open_devnull ! ( opened_devnull ) ;
149
152
}
150
153
}
151
154
}
0 commit comments