chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
impot: minor cleanups
[elogind.git]
/
src
/
import
/
import-dkr.c
diff --git
a/src/import/import-dkr.c
b/src/import/import-dkr.c
index cebec28144f4851278baa5c1082af636847f588a..1a6cd4eaffc29d2767ee88618f84531ee3cf6a79 100644
(file)
--- a/
src/import/import-dkr.c
+++ b/
src/import/import-dkr.c
@@
-454,7
+454,7
@@
static int dkr_import_job_on_open_disk(ImportJob *j) {
}
if (pipefd[0] != STDIN_FILENO)
}
if (pipefd[0] != STDIN_FILENO)
- safe_close(pipefd[0]);
+
pipefd[0] =
safe_close(pipefd[0]);
null_fd = open("/dev/null", O_WRONLY|O_NOCTTY);
if (null_fd < 0) {
null_fd = open("/dev/null", O_WRONLY|O_NOCTTY);
if (null_fd < 0) {
@@
-468,7
+468,11
@@
static int dkr_import_job_on_open_disk(ImportJob *j) {
}
if (null_fd != STDOUT_FILENO)
}
if (null_fd != STDOUT_FILENO)
- safe_close(null_fd);
+ null_fd = safe_close(null_fd);
+
+ fd_cloexec(STDIN_FILENO, false);
+ fd_cloexec(STDOUT_FILENO, false);
+ fd_cloexec(STDERR_FILENO, false);
execlp("tar", "tar", "--numeric-owner", "-C", i->temp_path, "-px", NULL);
log_error_errno(errno, "Failed to execute tar: %m");
execlp("tar", "tar", "--numeric-owner", "-C", i->temp_path, "-px", NULL);
log_error_errno(errno, "Failed to execute tar: %m");