r = 0;
finish:
- if (notify >= 0)
- close_nointr_nofail(notify);
+ safe_close(notify);
if (ttyfd >= 0) {
tcsetattr(ttyfd, TCSADRAIN, &old_termios);
}
- close_nointr_nofail(ttyfd);
+ safe_close(ttyfd);
}
return r;
return fd;
fail:
- close_nointr_nofail(fd);
+ safe_close(fd);
return r;
}
mkdir_p_label("/run/systemd/ask-password", 0755);
- RUN_WITH_UMASK(0022) {
- fd = mkostemp(temp, O_CLOEXEC|O_CREAT|O_WRONLY);
- }
-
+ fd = mkostemp_safe(temp, O_WRONLY|O_CLOEXEC);
if (fd < 0) {
log_error("Failed to create password file: %m");
r = -errno;
r = 0;
finish:
- if (fd >= 0)
- close_nointr_nofail(fd);
+ safe_close(fd);
if (socket_name) {
unlink(socket_name);
free(socket_name);
}
- if (socket_fd >= 0)
- close_nointr_nofail(socket_fd);
-
- if (signal_fd >= 0)
- close_nointr_nofail(signal_fd);
+ safe_close(socket_fd);
+ safe_close(signal_fd);
if (f)
fclose(f);