picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

impot: minor cleanups

Browse source
This commit is contained in:
Lennart Poettering 2015-01-22 03:51:22 +01:00
parent aca83a53ee
commit f4c135bf2f
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/import/import-dkr.c
View file

@ -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");

9
src/import/import-tar.c
View file

@ -292,7 +292,7 @@ static int tar_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) {
@ -306,7 +306,11 @@ static int tar_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");
@ -374,5 +378,4 @@ int tar_import_pull(TarImport *i, const char *url, const char *local, bool force
}
return 0;
}

2
src/import/import-tar.h
View file

@ -34,4 +34,4 @@ TarImport* tar_import_unref(TarImport *import);
DEFINE_TRIVIAL_CLEANUP_FUNC(TarImport*, tar_import_unref);
int tar_import_pull(TarImport *import, const char *rul, const char *local, bool force_local, ImportVerify verify);
int tar_import_pull(TarImport *import, const char *url, const char *local, bool force_local, ImportVerify verify);