62a3fc6d27
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.
73 lines
2.5 KiB
C
73 lines
2.5 KiB
C
/* SPDX-License-Identifier: LGPL-2.1+ */
|
|
|
|
#include <stdio.h>
|
|
|
|
#include "alloc-util.h"
|
|
#include "pretty-print.h"
|
|
#include "string-util.h"
|
|
#include "terminal-util.h"
|
|
#include "util.h"
|
|
|
|
int main(int argc, char *argv[]) {
|
|
_cleanup_free_ char *urlified = NULL, *q = NULL, *qq = NULL;
|
|
char *p, *z;
|
|
|
|
assert_se(p = strdup("\tFoobar\tbar\twaldo\t"));
|
|
assert_se(strip_tab_ansi(&p, NULL, NULL));
|
|
fprintf(stdout, "<%s>\n", p);
|
|
assert_se(streq(p, " Foobar bar waldo "));
|
|
free(p);
|
|
|
|
assert_se(p = strdup(ANSI_HIGHLIGHT "Hello" ANSI_NORMAL ANSI_HIGHLIGHT_RED " world!" ANSI_NORMAL));
|
|
assert_se(strip_tab_ansi(&p, NULL, NULL));
|
|
fprintf(stdout, "<%s>\n", p);
|
|
assert_se(streq(p, "Hello world!"));
|
|
free(p);
|
|
|
|
assert_se(p = strdup("\x1B[\x1B[\t\x1B[" ANSI_HIGHLIGHT "\x1B[" "Hello" ANSI_NORMAL ANSI_HIGHLIGHT_RED " world!" ANSI_NORMAL));
|
|
assert_se(strip_tab_ansi(&p, NULL, NULL));
|
|
assert_se(streq(p, "\x1B[\x1B[ \x1B[\x1B[Hello world!"));
|
|
free(p);
|
|
|
|
assert_se(p = strdup("\x1B[waldo"));
|
|
assert_se(strip_tab_ansi(&p, NULL, NULL));
|
|
assert_se(streq(p, "\x1B[waldo"));
|
|
free(p);
|
|
|
|
assert_se(p = strdup("\r\rwaldo"));
|
|
assert_se(strip_tab_ansi(&p, NULL, NULL));
|
|
assert_se(streq(p, "\r\rwaldo"));
|
|
free(p);
|
|
|
|
assert_se(p = strdup("waldo\r\r"));
|
|
assert_se(strip_tab_ansi(&p, NULL, NULL));
|
|
assert_se(streq(p, "waldo"));
|
|
free(p);
|
|
|
|
assert_se(p = strdup("waldo\r\r\n\r\n"));
|
|
assert_se(strip_tab_ansi(&p, NULL, NULL));
|
|
assert_se(streq(p, "waldo\n\n"));
|
|
free(p);
|
|
|
|
assert_se(terminal_urlify_path("/etc/fstab", "i am a fabulous link", &urlified) >= 0);
|
|
assert_se(p = strjoin("something ", urlified, " something-else"));
|
|
assert_se(q = strdup(p));
|
|
printf("<%s>\n", p);
|
|
assert_se(strip_tab_ansi(&p, NULL, NULL));
|
|
printf("<%s>\n", p);
|
|
assert_se(streq(p, "something i am a fabulous link something-else"));
|
|
p = mfree(p);
|
|
|
|
/* Truncate the formatted string in the middle of an ANSI sequence (in which case we shouldn't touch the
|
|
* incomplete sequence) */
|
|
z = strstr(q, "fstab");
|
|
if (z) {
|
|
*z = 0;
|
|
assert_se(qq = strdup(q));
|
|
assert_se(strip_tab_ansi(&q, NULL, NULL));
|
|
assert_se(streq(q, qq));
|
|
}
|
|
|
|
return 0;
|
|
}
|