}
static int do_execute(
- char **directories,
+ const char* const* directories,
usec_t timeout,
gather_stdout_callback_t const callbacks[_STDOUT_CONSUME_MAX],
void* const callback_args[_STDOUT_CONSUME_MAX],
*/
parallel_execution = FLAGS_SET(flags, EXEC_DIR_PARALLEL) && !callbacks;
- r = conf_files_list_strv(&paths, NULL, NULL, CONF_FILES_EXECUTABLE|CONF_FILES_REGULAR|CONF_FILES_FILTER_MASKED, (const char* const*) directories);
+ r = conf_files_list_strv(&paths, NULL, NULL, CONF_FILES_EXECUTABLE|CONF_FILES_REGULAR|CONF_FILES_FILTER_MASKED, directories);
if (r < 0)
return log_error_errno(r, "Failed to enumerate executables: %m");
char *envp[],
ExecDirFlags flags) {
- char **dirs = (char**) directories;
_cleanup_close_ int fd = -EBADF;
int r;
pid_t executor_pid;
- assert(!strv_isempty(dirs));
+ assert(!strv_isempty((char**) directories));
if (callbacks) {
assert(callback_args);
_cleanup_free_ char *name = NULL;
- r = path_extract_filename(dirs[0], &name);
+ r = path_extract_filename(directories[0], &name);
if (r < 0)
- return log_error_errno(r, "Failed to extract file name from '%s': %m", dirs[0]);
+ return log_error_errno(r, "Failed to extract file name from '%s': %m", directories[0]);
fd = open_serialization_fd(name);
if (fd < 0)
if (r < 0)
return r;
if (r == 0) {
- r = do_execute(dirs, timeout, callbacks, callback_args, fd, argv, envp, flags);
+ r = do_execute(directories, timeout, callbacks, callback_args, fd, argv, envp, flags);
_exit(r < 0 ? EXIT_FAILURE : r);
}