chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: move log_syntax() into src/shared/log.c, and make it more similar to the other...
[elogind.git]
/
src
/
shared
/
spawn-polkit-agent.c
diff --git
a/src/shared/spawn-polkit-agent.c
b/src/shared/spawn-polkit-agent.c
index 93652f052dc5012dad01f6e4931d19ca44fa96a4..4db249e1cac8fd298fe072c15116d2925581f061 100644
(file)
--- a/
src/shared/spawn-polkit-agent.c
+++ b/
src/shared/spawn-polkit-agent.c
@@
-19,18
+19,15
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sys/types.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdlib.h>
#include <unistd.h>
-#include <string.h>
-#include <sys/prctl.h>
#include <signal.h>
#include <signal.h>
-#include <fcntl.h>
#include <errno.h>
#include <errno.h>
-#include <
sys/
poll.h>
+#include <poll.h>
#include "log.h"
#include "util.h"
#include "log.h"
#include "util.h"
+#include "process-util.h"
#include "spawn-polkit-agent.h"
#ifdef ENABLE_POLKIT
#include "spawn-polkit-agent.h"
#ifdef ENABLE_POLKIT
@@
-39,7
+36,7
@@
static pid_t agent_pid = 0;
int polkit_agent_open(void) {
int r;
int pipe_fd[2];
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;
if (agent_pid > 0)
return 0;
@@
-52,8
+49,7
@@
int polkit_agent_open(void) {
if (pipe2(pipe_fd, 0) < 0)
return -errno;
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,
r = fork_agent(&agent_pid,
&pipe_fd[1], 1,
@@
-64,7
+60,7
@@
int polkit_agent_open(void) {
safe_close(pipe_fd[1]);
if (r < 0)
safe_close(pipe_fd[1]);
if (r < 0)
- log_error_errno(
-
r, "Failed to fork TTY ask password agent: %m");
+ 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_INFINITY);
else
/* Wait until the agent closes the fd */
fd_wait_for_event(pipe_fd[0], POLLHUP, USEC_INFINITY);