chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3f79675
)
udev: event - modernize spawn_exec()
author
Tom Gundersen
<teg@jklm.no>
Wed, 17 Sep 2014 19:53:20 +0000
(21:53 +0200)
committer
Tom Gundersen
<teg@jklm.no>
Wed, 17 Sep 2014 20:19:53 +0000
(22:19 +0200)
src/udev/udev-event.c
patch
|
blob
|
history
diff --git
a/src/udev/udev-event.c
b/src/udev/udev-event.c
index c8b142077e4432ed4c01a10fc8f730c2efbabccb..dc1f682bfe56afedcc254a2ab6657a09a23f2800 100644
(file)
--- a/
src/udev/udev-event.c
+++ b/
src/udev/udev-event.c
@@
-376,8
+376,7
@@
out:
static int spawn_exec(struct udev_event *event,
const char *cmd, char *const argv[], char **envp, const sigset_t *sigmask,
int fd_stdout, int fd_stderr) {
static int spawn_exec(struct udev_event *event,
const char *cmd, char *const argv[], char **envp, const sigset_t *sigmask,
int fd_stdout, int fd_stderr) {
- int err;
- int fd;
+ _cleanup_close_ int fd = -1;
/* discard child output or connect to pipe */
fd = open("/dev/null", O_RDWR);
/* discard child output or connect to pipe */
fd = open("/dev/null", O_RDWR);
@@
-387,19
+386,17
@@
static int spawn_exec(struct udev_event *event,
dup2(fd, STDOUT_FILENO);
if (fd_stderr < 0)
dup2(fd, STDERR_FILENO);
dup2(fd, STDOUT_FILENO);
if (fd_stderr < 0)
dup2(fd, STDERR_FILENO);
- close(fd);
- } else {
+ } else
log_error("open /dev/null failed: %m");
log_error("open /dev/null failed: %m");
- }
/* connect pipes to std{out,err} */
if (fd_stdout >= 0) {
dup2(fd_stdout, STDOUT_FILENO);
/* connect pipes to std{out,err} */
if (fd_stdout >= 0) {
dup2(fd_stdout, STDOUT_FILENO);
-
close(fd_stdout);
+
safe_
close(fd_stdout);
}
if (fd_stderr >= 0) {
dup2(fd_stderr, STDERR_FILENO);
}
if (fd_stderr >= 0) {
dup2(fd_stderr, STDERR_FILENO);
- close(fd_stderr);
+
safe_
close(fd_stderr);
}
/* terminate child in case parent goes away */
}
/* terminate child in case parent goes away */
@@
-412,9
+409,9
@@
static int spawn_exec(struct udev_event *event,
execve(argv[0], argv, envp);
/* exec failed */
execve(argv[0], argv, envp);
/* exec failed */
- err = -errno;
log_error("failed to execute '%s' '%s': %m", argv[0], cmd);
log_error("failed to execute '%s' '%s': %m", argv[0], cmd);
- return err;
+
+ return -errno;
}
static void spawn_read(struct udev_event *event,
}
static void spawn_read(struct udev_event *event,