X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fspawn-polkit-agent.c;h=ada4bdb17e284dfcc98e40d4a71bda0a76ae934a;hb=51e8372fb6cca277dc7afc6e83f48a1a2b6d4dbe;hp=fccf1e9173b709ffc6bb7fd7402ef8f9103ba1b4;hpb=03e334a1c7dc8c20c38902aa039440763acc9b17;p=elogind.git
diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index fccf1e917..ada4bdb17 100644
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -19,19 +19,21 @@
along with systemd; If not, see .
***/
-#include
+#include
+#include
+#include
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "fd-util.h"
+#include "io-util.h"
#include "log.h"
-#include "util.h"
+#include "macro.h"
+#include "process-util.h"
#include "spawn-polkit-agent.h"
+#include "stdio-util.h"
+#include "time-util.h"
+#include "util.h"
#ifdef ENABLE_POLKIT
static pid_t agent_pid = 0;
@@ -39,7 +41,7 @@ static pid_t agent_pid = 0;
int polkit_agent_open(void) {
int r;
int pipe_fd[2];
- char notify_fd[10 + 1];
+ char notify_fd[DECIMAL_STR_MAX(int) + 1];
if (agent_pid > 0)
return 0;
@@ -52,8 +54,7 @@ int polkit_agent_open(void) {
if (pipe2(pipe_fd, 0) < 0)
return -errno;
- snprintf(notify_fd, sizeof(notify_fd), "%i", pipe_fd[1]);
- char_array_0(notify_fd);
+ xsprintf(notify_fd, "%i", pipe_fd[1]);
r = fork_agent(&agent_pid,
&pipe_fd[1], 1,
@@ -64,10 +65,10 @@ int polkit_agent_open(void) {
safe_close(pipe_fd[1]);
if (r < 0)
- log_error("Failed to fork TTY ask password agent: %s", strerror(-r));
+ log_error_errno(r, "Failed to fork TTY ask password agent: %m");
else
/* Wait until the agent closes the fd */
- fd_wait_for_event(pipe_fd[0], POLLHUP, (usec_t) -1);
+ fd_wait_for_event(pipe_fd[0], POLLHUP, USEC_INFINITY);
safe_close(pipe_fd[0]);
@@ -80,9 +81,10 @@ void polkit_agent_close(void) {
return;
/* Inform agent that we are done */
- kill(agent_pid, SIGTERM);
- kill(agent_pid, SIGCONT);
- wait_for_terminate(agent_pid, NULL);
+ (void) kill(agent_pid, SIGTERM);
+ (void) kill(agent_pid, SIGCONT);
+
+ (void) wait_for_terminate(agent_pid, NULL);
agent_pid = 0;
}