picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

show-status: add newline to ephemeral messages

Browse source 
Fixes #6712.  The newline is later reversed, naturally.
This commit is contained in:
Tomsod M 2018-05-20 18:58:58 +03:00 committed by Zbigniew Jędrzejewski-Szmek
parent 1448dfa6bf
commit 8255430754
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/basic/terminal-util.h
View file

@ -50,6 +50,9 @@
/* Erase characters until the end of the line */
#define ANSI_ERASE_TO_END_OF_LINE "\x1B[K"
/* Move cursor up one line */
#define ANSI_REVERSE_LINEFEED "\x1BM"
/* Set cursor to top left corner and clear screen */
#define ANSI_HOME_CLEAR "\x1B[H\x1B[2J"

12
src/core/show-status.c
View file

@ -32,7 +32,7 @@ int status_vprintf(const char *status, bool ellipse, bool ephemeral, const char
static const char status_indent[] = " "; /* "[" STATUS "] " */
_cleanup_free_ char *s = NULL;
_cleanup_close_ int fd = -1;
struct iovec iovec[6] = {};
struct iovec iovec[7] = {};
int n = 0;
static bool prev_ephemeral;
@ -76,8 +76,7 @@ int status_vprintf(const char *status, bool ellipse, bool ephemeral, const char
}
if (prev_ephemeral)
iovec[n++] = IOVEC_MAKE_STRING("\r" ANSI_ERASE_TO_END_OF_LINE);
prev_ephemeral = ephemeral;
iovec[n++] = IOVEC_MAKE_STRING(ANSI_REVERSE_LINEFEED "\r" ANSI_ERASE_TO_END_OF_LINE);
if (status) {
if (!isempty(status)) {
@ -89,8 +88,11 @@ int status_vprintf(const char *status, bool ellipse, bool ephemeral, const char
}
iovec[n++] = IOVEC_MAKE_STRING(s);
if (!ephemeral)
iovec[n++] = IOVEC_MAKE_STRING("\n");
iovec[n++] = IOVEC_MAKE_STRING("\n");
if (prev_ephemeral && !ephemeral)
iovec[n++] = IOVEC_MAKE_STRING(ANSI_ERASE_TO_END_OF_LINE);
prev_ephemeral = ephemeral;
if (writev(fd, iovec, n) < 0)
return -errno;