]> git.ipfire.org Git - thirdparty/systemd.git/commit
shared/logs-show: strip trailing carriage returns at EOL/EOF
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 29 Oct 2019 09:31:19 +0000 (10:31 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 29 Oct 2019 09:54:45 +0000 (10:54 +0100)
commit62a3fc6d27d6c78ad2157cd1bf7884a922ea02d6
treeda89a73ffb2900b8fac3b4061f98121aa5bd3a6b
parent0bb0a9faa7a9be917255648dcbc4b13132d90161
shared/logs-show: strip trailing carriage returns at EOL/EOF

When showing logs from a container, we would fail to show various lines:
Oct 29 09:50:51 krowka systemd-nspawn[61376]: Detected architecture x86-64.
Oct 29 09:50:51 krowka systemd-nspawn[61376]: [1B blob data]
Oct 29 09:50:51 krowka systemd-nspawn[61376]: Welcome to Fedora 32 (Rawhide)!
Oct 29 09:50:51 krowka systemd-nspawn[61376]: [1B blob data]

Those are only harmless \r characters that trail the line. We already replace
tabs and strip various ansi characters that we deem inconsequential, so let's
also strip trailing carriage returns. Non-trailing ones are different, because
they change what would be displayed.
src/basic/string-util.c
src/test/test-strip-tab-ansi.c
src/test/test-utf8.c