[PATCH 3/6] virshPrintJobProgress: Don't rewrite migration status line on non-terminals
From: Peter Krempa <pkrempa(a)redhat.com>
On non-terminals print each progress report on a new line. Fix based on
suggestion in the issue report.
Closes: https://gitlab.com/libvirt/libvirt/-/issues/756
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tools/virsh-domain.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 8d615b6e7a..7253596f4a 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -2091,10 +2091,13 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd)
static void
-virshPrintJobProgress(const char *label, unsigned long long remaining,
+virshPrintJobProgress(const char *label,
+ unsigned long long remaining,
unsigned long long total)
{
double progress = 100.00;
+ const char *term_start = "\r";
+ const char *term_end = "";
/* if remaining == 0 migration has completed */
if (remaining != 0) {
@@ -2106,10 +2109,16 @@ virshPrintJobProgress(const char *label, unsigned long long
remaining,
}
}
+ if (!isatty(STDERR_FILENO)) {
+ term_start = "";
+ term_end = "\n";
+ }
+
/* see comments in vshError about why we must flush */
fflush(stdout);
/* avoid auto-round-off of double by keeping only 2 decimals */
- fprintf(stderr, "\r%s: [%5.2f %%]", label, (int)(progress*100)/100.0);
+ fprintf(stderr, "%s%s: [%5.2f %%]%s",
+ term_start, label, (int)(progress*100)/100.0, term_end);
fflush(stderr);
}
--
2.49.0