mirror of
https://github.com/troglobit/finit.git
synced 2026-11-08 16:11:10 +00:00
Fix #210: simplify escape code to clear line
Since we just want to clear the complete line, and are already a the beginning of the line, we can use the simpler \e[K which also seems to fix the display resize bug in #210. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
1cf204e23d
commit
cb2969002c
3 files changed
+4
-4
No files matched your search
+1
-1
@@ -286,7 +286,7 @@ static void prepare_tty(char *tty, speed_t speed, char *procname, struct rlimit
|
|||||||
static int activate_console(int noclear, int nowait)
|
static int activate_console(int noclear, int nowait)
|
||||||
{
|
{
|
||||||
static const char msg[] = "\nPlease press Enter to activate this console.";
|
static const char msg[] = "\nPlease press Enter to activate this console.";
|
||||||
static const char clr[] = "\r\e[2K";
|
static const char clr[] = "\r\e[K";
|
||||||
static const char cup[] = "\e[A";
|
static const char cup[] = "\e[A";
|
||||||
struct termios orig;
|
struct termios orig;
|
||||||
char c;
|
char c;
|
||||||
|
|||||||
+1
-1
@@ -196,7 +196,7 @@ static int do_login(char *name)
|
|||||||
|
|
||||||
static int getty(char *tty, speed_t speed, char *term, char *user)
|
static int getty(char *tty, speed_t speed, char *term, char *user)
|
||||||
{
|
{
|
||||||
const char cln[] = "\r\e[2K\n";
|
const char cln[] = "\r\e[K\n";
|
||||||
char name[33]; /* useradd(1) limit at 32 chars */
|
char name[33]; /* useradd(1) limit at 32 chars */
|
||||||
pid_t sid;
|
pid_t sid;
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -227,7 +227,7 @@ void print_banner(const char *heading)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
buf[0] = 0;
|
buf[0] = 0;
|
||||||
strlcat(buf, "\r\e[2K", sizeof(buf));
|
strlcat(buf, "\r\e[K", sizeof(buf));
|
||||||
|
|
||||||
if (progress_style == PROGRESS_CLASSIC) {
|
if (progress_style == PROGRESS_CLASSIC) {
|
||||||
strlcat(buf, "\e[1m", sizeof(buf));
|
strlcat(buf, "\e[1m", sizeof(buf));
|
||||||
@@ -312,7 +312,7 @@ void printv(const char *fmt, va_list ap)
|
|||||||
if (progress_style == PROGRESS_CLASSIC)
|
if (progress_style == PROGRESS_CLASSIC)
|
||||||
cprintf("\r%s ", pad(buf, sizeof(buf), ".", sizeof(buf)));
|
cprintf("\r%s ", pad(buf, sizeof(buf), ".", sizeof(buf)));
|
||||||
else
|
else
|
||||||
cprintf("\r\e[2K%s%s", status(3), buf);
|
cprintf("\r\e[K%s%s", status(3), buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
void print(int rc, const char *fmt, ...)
|
void print(int rc, const char *fmt, ...)
|
||||||
|
|||||||
Reference in new issue
Block a user