picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tree-wide: some O_NDELAY → O_NONBLOCK fixes

Browse source 
Somehow the coccinelle script misses these, hence fix them manually.
This commit is contained in:
Lennart Poettering 2018-05-31 12:04:37 +02:00
parent 642b59ff40
commit 669fc4e5c5
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nspawn/nspawn.c
View file

@ -1952,7 +1952,7 @@ static int setup_kmsg(int kmsg_socket) {
if (r < 0)
return r;
fd = open(from, O_RDWR|O_NDELAY|O_CLOEXEC);
fd = open(from, O_RDWR|O_NONBLOCK|O_CLOEXEC);
if (fd < 0)
return log_error_errno(errno, "Failed to open fifo: %m");
@ -4478,7 +4478,7 @@ int main(int argc, char *argv[]) {
isatty(STDIN_FILENO) > 0 &&
isatty(STDOUT_FILENO) > 0;
master = posix_openpt(O_RDWR|O_NOCTTY|O_CLOEXEC|O_NDELAY);
master = posix_openpt(O_RDWR|O_NOCTTY|O_CLOEXEC|O_NONBLOCK);
if (master < 0) {
r = log_error_errno(errno, "Failed to acquire pseudo tty: %m");
goto finish;

2
src/run/run.c
View file

@ -917,7 +917,7 @@ static int start_transient_service(
if (arg_stdio == ARG_STDIO_PTY) {
if (arg_transport == BUS_TRANSPORT_LOCAL) {
master = posix_openpt(O_RDWR|O_NOCTTY|O_CLOEXEC|O_NDELAY);
master = posix_openpt(O_RDWR|O_NOCTTY|O_CLOEXEC|O_NONBLOCK);
if (master < 0)
return log_error_errno(errno, "Failed to acquire pseudo tty: %m");

2
src/tmpfiles/tmpfiles.c
View file

@ -1245,7 +1245,7 @@ static int write_one_file(Item *i, const char *path) {
RUN_WITH_UMASK(0000) {
mac_selinux_create_file_prepare(path, S_IFREG);
fd = open(path, flags|O_NDELAY|O_CLOEXEC|O_WRONLY|O_NOCTTY, i->mode);
fd = open(path, flags|O_NONBLOCK|O_CLOEXEC|O_WRONLY|O_NOCTTY, i->mode);
mac_selinux_create_file_clear();
}