summaryrefslogtreecommitdiff
path: root/src/import/import-dkr.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-01-22 03:51:22 +0100
committerLennart Poettering <lennart@poettering.net>2015-01-22 04:02:07 +0100
commitf4c135bf2f0abcf79c89efbeae51f03bacba5f2f (patch)
tree5bfb25be01f56750a8eedc39166919ef1a2831f3 /src/import/import-dkr.c
parentaca83a53ee1dd01beafcd07c55c4cd6c3efb4224 (diff)
impot: minor cleanups
Diffstat (limited to 'src/import/import-dkr.c')
-rw-r--r--src/import/import-dkr.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/import/import-dkr.c b/src/import/import-dkr.c
index cebec28144..1a6cd4eaff 100644
--- 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)
- safe_close(pipefd[0]);
+ pipefd[0] = safe_close(pipefd[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)
- 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");