diff --git a/src/core/exec-invoke.c b/src/core/exec-invoke.c index ba610c217e..ff6d73b9db 100644 --- a/src/core/exec-invoke.c +++ b/src/core/exec-invoke.c @@ -187,6 +187,18 @@ static int connect_journal_socket( return r; } +static bool exec_output_forward_to_console(ExecOutput o) { + return IN_SET(o, + EXEC_OUTPUT_JOURNAL_AND_CONSOLE, + EXEC_OUTPUT_KMSG_AND_CONSOLE); +} + +static bool exec_output_forward_to_kmsg(ExecOutput o) { + return IN_SET(o, + EXEC_OUTPUT_KMSG, + EXEC_OUTPUT_KMSG_AND_CONSOLE); +} + static int connect_logger_as( const ExecContext *context, const ExecParameters *params, @@ -219,20 +231,20 @@ static int connect_logger_as( (void) fd_inc_sndbuf(fd, SNDBUF_SIZE); if (dprintf(fd, - "%s\n" - "%s\n" - "%i\n" - "%i\n" - "%i\n" - "%i\n" - "%i\n", - context->syslog_identifier ?: ident, - params->flags & EXEC_PASS_LOG_UNIT ? params->unit_id : "", - context->syslog_priority, - !!context->syslog_level_prefix, - false, - exec_output_is_kmsg(output), - exec_output_is_terminal(output)) < 0) + "%s\n" + "%s\n" + "%i\n" + "%i\n" + "%i\n" + "%i\n" + "%i\n", + context->syslog_identifier ?: ident, + params->flags & EXEC_PASS_LOG_UNIT ? params->unit_id : "", + context->syslog_priority, + !!context->syslog_level_prefix, + false, + exec_output_forward_to_kmsg(output), + exec_output_forward_to_console(output)) < 0) return -errno; return move_fd(TAKE_FD(fd), nfd, false); diff --git a/src/core/execute.h b/src/core/execute.h index 8b2750cfb2..dc150e65bc 100644 --- a/src/core/execute.h +++ b/src/core/execute.h @@ -470,19 +470,6 @@ static inline bool exec_input_is_terminal(ExecInput i) { EXEC_INPUT_TTY_FAIL); } -static inline bool exec_output_is_terminal(ExecOutput o) { - return IN_SET(o, - EXEC_OUTPUT_TTY, - EXEC_OUTPUT_KMSG_AND_CONSOLE, - EXEC_OUTPUT_JOURNAL_AND_CONSOLE); -} - -static inline bool exec_output_is_kmsg(ExecOutput o) { - return IN_SET(o, - EXEC_OUTPUT_KMSG, - EXEC_OUTPUT_KMSG_AND_CONSOLE); -} - static inline bool exec_context_has_tty(const ExecContext *context) { assert(context);