From: Mike Yuan <me@yhndnzj.com>
Date: Sat, 2 Mar 2024 03:45:02 +0000 (+0800)
Subject: shared/pretty-print: print color sequence only when needed
X-Git-Tag: v256-rc1~667^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6283f873fb4a448adb99d0b1a3d994a35f79a973;p=thirdparty%2Fsystemd.git

shared/pretty-print: print color sequence only when needed

Follow-up for 71cb203a6ea6de409c6b9c042feda2ff655101e9
---

diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
index 543a9ebdcb9..af44bb2ca2e 100644
--- a/src/shared/pretty-print.c
+++ b/src/shared/pretty-print.c
@@ -465,7 +465,7 @@ int terminal_tint_color(double hue, char **ret) {
 
 void draw_progress_bar(const char *prefix, double percentage) {
 
-        fputs("\r", stderr);
+        fputc('\r', stderr);
         if (prefix)
                 fputs(prefix, stderr);
 
@@ -474,12 +474,12 @@ void draw_progress_bar(const char *prefix, double percentage) {
                 size_t prefix_length = strlen_ptr(prefix);
                 size_t length = cols > prefix_length + 6 ? cols - prefix_length - 6 : 0;
 
-                fputs(ansi_highlight_green(), stderr);
-
                 if (length > 5 && percentage >= 0.0 && percentage <= 100.0) {
                         size_t p = (size_t) (length * percentage / 100.0);
                         bool separator_done = false;
 
+                        fputs(ansi_highlight_green(), stderr);
+
                         for (size_t i = 0; i < length; i++) {
 
                                 if (i <= p) {