return -errno;
r = connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1));
- if (r < 0) {
- log_error("Failed to connect to Plymouth: %m");
- return -errno;
- }
+ if (r < 0)
+ return log_error_errno(errno, "Failed to connect to Plymouth: %m");
if (accept_cached) {
packet = strdup("c");
if (!packet)
return log_oom();
- k = loop_write(fd, packet, n + 1, true);
- if (k != n + 1)
- return k < 0 ? (int) k : -EIO;
+ r = loop_write(fd, packet, n + 1, true);
+ if (r < 0)
+ return r;
pollfd[POLL_SOCKET].fd = fd;
pollfd[POLL_SOCKET].events = POLLIN;
if (asprintf(&packet, "*\002%c%s%n", (int) (strlen(message) + 1), message, &n) < 0)
return -ENOMEM;
- k = loop_write(fd, packet, n+1, true);
- if (k != n + 1)
- return k < 0 ? (int) k : -EIO;
+ r = loop_write(fd, packet, n+1, true);
+ if (r < 0)
+ return r;
accept_cached = false;
p = 0;
/* If the query went away, that's OK */
return 0;
- if (r < 0) {
- log_error_errno(-r, "Failed to query password: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to query password: %m");
socket_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
- if (socket_fd < 0) {
- log_error("socket(): %m");
- return -errno;
- }
+ if (socket_fd < 0)
+ return log_error_errno(errno, "socket(): %m");
sa.un.sun_family = AF_UNIX;
strncpy(sa.un.sun_path, socket_name, sizeof(sa.un.sun_path));
r = sendto(socket_fd, packet, packet_length, MSG_NOSIGNAL, &sa.sa,
offsetof(struct sockaddr_un, sun_path) + strlen(socket_name));
if (r < 0) {
- log_error("Failed to send: %m");
+ log_error_errno(errno, "Failed to send: %m");
return r;
}
}
if (errno == ENOENT)
return 0;
- log_error("opendir(/run/systemd/ask-password): %m");
+ log_error_errno(errno, "opendir(/run/systemd/ask-password): %m");
return -errno;
}
if (de->d_type != DT_REG)
continue;
- if (ignore_file(de->d_name))
+ if (hidden_file(de->d_name))
continue;
if (!startswith(de->d_name, "ask."))
for (;;) {
r = show_passwords();
if (r < 0)
- log_error_errno(-r, "Failed to show password: %m");
+ log_error_errno(r, "Failed to show password: %m");
if (poll(pollfd, _FD_MAX, -1) < 0) {
if (errno == EINTR)
r = show_passwords();
if (r < 0)
- log_error_errno(-r, "Error: %m");
+ log_error_errno(r, "Error: %m");
finish:
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;