From 114ee84e94a23cd22f46e20cd38f658de82939aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Thu, 3 Dec 2020 12:07:40 +0300 Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B0?= =?UTF-8?q?=20tty7=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=B7=D0=B0=D0=B3?= =?UTF-8?q?=D1=80=D1=83=D0=B7=D0=BA=D0=B8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit af8a98a844fe3911cfc60618000ddde8a2466518. --- Makefile | 2 +- plymouth.c | 21 --------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/Makefile b/Makefile index cebdbd7..0ba94f9 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ PKG := $(PKG_NAME)-$(PKG_VERSION) BZIP2 := bzip2 -f -9 GZIP := gzip -f -9 CFLAGS += -fPIC -Wall -LDLIBS := -leinfo -lrc -lncurses +LDLIBS := -leinfo -lrc LDFLAGS += -fPIC -shared INSTALL := install -D diff --git a/plymouth.c b/plymouth.c index 48a69e8..0f0daf1 100644 --- a/plymouth.c +++ b/plymouth.c @@ -27,7 +27,6 @@ #include #include #include -#include #ifdef DEBUG @@ -97,25 +96,6 @@ bool ply_message(const char* hook, const char* name) } -void clear_tty(char *tty) { - FILE *f = fopen(tty,"w"); - if(f) { - int result; - char *clear_screen_token = "\x1b[3J"; - char *hide_cursor_token = NULL; - int fd = fileno(f); - - fwrite(clear_screen_token, strlen(clear_screen_token), 1, f); - setupterm(NULL, fd, &result); - if(result > 0) { - hide_cursor_token = tigetstr("civis"); - fwrite(hide_cursor_token, strlen(hide_cursor_token), 1, f); - } - fclose(f); - } -} - - bool ply_ping() { return (system("/bin/plymouth --ping") == 0); @@ -295,7 +275,6 @@ int rc_plugin_hook(RC_HOOK hook, const char *name) if(!ply_quit(PLY_MODE_BOOT)) rv = 1; restart_console_font(); - clear_tty("/dev/tty7"); } break;