Add 8bit-version of get_process_cmdline() and use in cgroup-show.c

This restores show_pid_array() output in legacy locales on the console.
Only one call to get_process_cmdline() is changed, all others retain
utf8-only mode. This affects systemd-cgls, systemctl status, etc, when
working locally.

Calls to get_process_cmdline() that cross a process boundary always use
utf8. It's the callers responsibility to convert this to some encoding that
they use. This means that we always pass utf8 over the bus.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2019-05-22 10:16:00 +02:00
parent 09c1dceef1
commit e3b4efd28f
5 changed files with 16 additions and 2 deletions
+4 -1
View File
@@ -30,6 +30,7 @@
#include "fileio.h"
#include "fs-util.h"
#include "ioprio.h"
#include "locale-util.h"
#include "log.h"
#include "macro.h"
#include "memory-util.h"
@@ -178,7 +179,9 @@ int get_process_cmdline(pid_t pid, size_t max_columns, ProcessCmdlineFlags flags
delete_trailing_chars(t, WHITESPACE);
ans = utf8_escape_non_printable_full(t, max_columns);
bool eight_bit = (flags & PROCESS_CMDLINE_USE_LOCALE) && !is_locale_utf8();
ans = escape_non_printable_full(t, max_columns, eight_bit);
if (!ans)
return -ENOMEM;