chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hwdb: adjust --help text to be more like other --help texts
[elogind.git]
/
src
/
tty-ask-password-agent
/
tty-ask-password-agent.c
diff --git
a/src/tty-ask-password-agent/tty-ask-password-agent.c
b/src/tty-ask-password-agent/tty-ask-password-agent.c
index f8e80a39becf93884c1b081598f850d57c0052a0..bdf651246bd0dad742e017a6c157cea0b1e45a74 100644
(file)
--- a/
src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/
src/tty-ask-password-agent/tty-ask-password-agent.c
@@
-90,10
+90,8
@@
static int ask_password_plymouth(
return -errno;
r = connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1));
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_errno(errno, "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 (accept_cached) {
packet = strdup("c");
@@
-105,9
+103,9
@@
static int ask_password_plymouth(
if (!packet)
return log_oom();
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;
pollfd[POLL_SOCKET].fd = fd;
pollfd[POLL_SOCKET].events = POLLIN;
@@
-167,9
+165,9
@@
static int ask_password_plymouth(
if (asprintf(&packet, "*\002%c%s%n", (int) (strlen(message) + 1), message, &n) < 0)
return -ENOMEM;
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;
accept_cached = false;
p = 0;
@@
-342,10
+340,8
@@
static int parse_password(const char *filename, char **wall) {
return log_error_errno(r, "Failed to query password: %m");
socket_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 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_errno(errno, "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));
sa.un.sun_family = AF_UNIX;
strncpy(sa.un.sun_path, socket_name, sizeof(sa.un.sun_path));
@@
-389,7
+385,7
@@
static bool wall_tty_match(const char *path) {
_cleanup_free_ char *p = NULL;
if (!path_is_absolute(path))
_cleanup_free_ char *p = NULL;
if (!path_is_absolute(path))
- path = str
append
a("/dev/", path);
+ path = str
join
a("/dev/", path);
r = lstat(path, &st);
if (r < 0)
r = lstat(path, &st);
if (r < 0)
@@
-442,7
+438,7
@@
static int show_passwords(void) {
if (de->d_type != DT_REG)
continue;
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."))
continue;
if (!startswith(de->d_name, "ask."))