summaryrefslogtreecommitdiffstats
path: root/src/shared/pretty-print.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-16 18:18:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-16 18:18:14 +0000
commit67c5de60daa85b91fa68be4157e248fa31e75316 (patch)
tree7d567f3360f705ac21600343ef7f7cea645a9222 /src/shared/pretty-print.c
parentAdding upstream version 256.1. (diff)
downloadsystemd-06a0a2fdeaf41892705cfec541146336e3c21087.tar.xz
systemd-06a0a2fdeaf41892705cfec541146336e3c21087.zip
Adding upstream version 256.2.upstream/256.2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/shared/pretty-print.c')
-rw-r--r--src/shared/pretty-print.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
index c75f74a..4692a6a 100644
--- a/src/shared/pretty-print.c
+++ b/src/shared/pretty-print.c
@@ -17,6 +17,7 @@
#include "string-util.h"
#include "strv.h"
#include "terminal-util.h"
+#include "utf8.h"
void draw_cylon(char buffer[], size_t buflen, unsigned width, unsigned pos) {
char *p = buffer;
@@ -467,8 +468,8 @@ void draw_progress_bar(const char *prefix, double percentage) {
if (!terminal_is_dumb()) {
size_t cols = columns();
- size_t prefix_length = strlen_ptr(prefix);
- size_t length = cols > prefix_length + 6 ? cols - prefix_length - 6 : 0;
+ size_t prefix_width = utf8_console_width(prefix);
+ size_t length = cols > prefix_width + 6 ? cols - prefix_width - 6 : 0;
if (length > 5 && percentage >= 0.0 && percentage <= 100.0) {
size_t p = (size_t) (length * percentage / 100.0);
@@ -519,7 +520,7 @@ void clear_progress_bar(const char *prefix) {
fputc('\r', stderr);
if (terminal_is_dumb())
- fputs(strrepa(" ", strlen_ptr(prefix) + 4), /* 4: %3.0f%% */
+ fputs(strrepa(" ", utf8_console_width(prefix) + 4), /* 4: %3.0f%% */
stderr);
else
fputs(ANSI_ERASE_TO_END_OF_LINE, stderr);