shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-30 06:25:37 +03:00
Code

exec-util: make execute_strv() optionally take root directory

Browse Source 
Preparation for rewriting kernel-install in C.
This commit is contained in:
Yu Watanabe 2023-04-16 15:31:10 +09:00
parent f384ce1187
commit 8521338f95
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/exec-util.c
View File

@ -80,6 +80,7 @@ static int do_spawn(const char *path, char *argv[], int stdout_fd, pid_t *pid, b
static int do_execute(
char* const* paths,
const char *root,
usec_t timeout,
gather_stdout_callback_t const callbacks[_STDOUT_CONSUME_MAX],
void* const callback_args[_STDOUT_CONSUME_MAX],
@ -121,7 +122,7 @@ static int do_execute(
_cleanup_close_ int fd = -EBADF;
pid_t pid;
t = strdup(*path);
t = path_join(root, *path);
if (!t)
return log_oom();
@ -207,6 +208,7 @@ static int do_execute(
int execute_strv(
const char *name,
char* const* paths,
const char *root,
usec_t timeout,
gather_stdout_callback_t const callbacks[_STDOUT_CONSUME_MAX],
void* const callback_args[_STDOUT_CONSUME_MAX],
@ -243,7 +245,7 @@ int execute_strv(
if (r < 0)
return r;
if (r == 0) {
r = do_execute(paths, timeout, callbacks, callback_args, fd, argv, envp, flags);
r = do_execute(paths, root, timeout, callbacks, callback_args, fd, argv, envp, flags);
_exit(r < 0 ? EXIT_FAILURE : r);
}
@ -295,7 +297,7 @@ int execute_directories(
return log_error_errno(r, "Failed to extract file name from '%s': %m", directories[0]);
}
return execute_strv(name, paths, timeout, callbacks, callback_args, argv, envp, flags);
return execute_strv(name, paths, NULL, timeout, callbacks, callback_args, argv, envp, flags);
}
static int gather_environment_generate(int fd, void *arg) {

1
src/shared/exec-util.h
View File

@ -34,6 +34,7 @@ typedef enum ExecCommandFlags {
int execute_strv(
const char *name,
char* const* paths,
const char *root,
usec_t timeout,
gather_stdout_callback_t const callbacks[_STDOUT_CONSUME_MAX],
void* const callback_args[_STDOUT_CONSUME_MAX],