mirror of
https://github.com/systemd/systemd.git
synced 2024-10-27 18:55:40 +03:00
run: move condition inside set_window_title()
This commit is contained in:
parent
0bdaa99827
commit
86295cb60e
@ -4563,6 +4563,9 @@ static void set_window_title(PTYForward *f) {
|
||||
|
||||
assert(f);
|
||||
|
||||
if (!shall_set_terminal_title())
|
||||
return;
|
||||
|
||||
(void) gethostname_strict(&hn);
|
||||
|
||||
if (emoji_enabled())
|
||||
@ -5562,8 +5565,7 @@ static int run_container(
|
||||
} else if (!isempty(arg_background))
|
||||
(void) pty_forward_set_background_color(forward, arg_background);
|
||||
|
||||
if (shall_set_terminal_title())
|
||||
set_window_title(forward);
|
||||
set_window_title(forward);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -1634,8 +1634,12 @@ static int acquire_invocation_id(sd_bus *bus, const char *unit, sd_id128_t *ret)
|
||||
|
||||
static void set_window_title(PTYForward *f) {
|
||||
_cleanup_free_ char *hn = NULL, *cl = NULL, *dot = NULL;
|
||||
|
||||
assert(f);
|
||||
|
||||
if (!shall_set_terminal_title())
|
||||
return;
|
||||
|
||||
if (!arg_host)
|
||||
(void) gethostname_strict(&hn);
|
||||
|
||||
@ -1848,8 +1852,7 @@ static int start_transient_service(sd_bus *bus) {
|
||||
if (!isempty(arg_background))
|
||||
(void) pty_forward_set_background_color(c.forward, arg_background);
|
||||
|
||||
if (shall_set_terminal_title())
|
||||
set_window_title(c.forward);
|
||||
set_window_title(c.forward);
|
||||
}
|
||||
|
||||
path = unit_dbus_path_from_name(service);
|
||||
|
@ -1257,6 +1257,9 @@ static void set_window_title(PTYForward *f) {
|
||||
|
||||
assert(f);
|
||||
|
||||
if (!shall_set_terminal_title())
|
||||
return;
|
||||
|
||||
(void) gethostname_strict(&hn);
|
||||
|
||||
if (emoji_enabled())
|
||||
@ -2141,8 +2144,7 @@ static int run_virtual_machine(int kvm_device_fd, int vhost_device_fd) {
|
||||
} else if (!isempty(arg_background))
|
||||
(void) pty_forward_set_background_color(forward, arg_background);
|
||||
|
||||
if (shall_set_terminal_title())
|
||||
set_window_title(forward);
|
||||
set_window_title(forward);
|
||||
}
|
||||
|
||||
r = sd_event_loop(event);
|
||||
|
Loading…
Reference in New Issue
Block a user