X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Fclear.c;h=e9203a29e95fff901dcca02ecd64909313a1bfd9;hp=4ac503ed3641570468eac4a4e00bab24ecc74400;hb=f06e14af5e11df95d6542964bf1b349d2843bb11;hpb=d3aaa2f7ce1fec732af0f6c0396719cbc846ac18 diff --git a/progs/clear.c b/progs/clear.c index 4ac503ed..e9203a29 100644 --- a/progs/clear.c +++ b/progs/clear.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2007,2013 Free Software Foundation, Inc. * + * Copyright (c) 1998-2013,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -36,32 +36,19 @@ * clear.c -- clears the terminal's screen */ -#define USE_LIBTINFO -#include +#define USE_LIBTINFO 1 +#include -MODULE_ID("$Id: clear.c,v 1.13 2013/06/22 22:20:54 tom Exp $") - -static int -putch(int c) -{ - return putchar(c); -} +MODULE_ID("$Id: clear.c,v 1.15 2016/10/23 00:36:36 tom Exp $") int main( int argc GCC_UNUSED, char *argv[]GCC_UNUSED) { - char *E3; - setupterm((char *) 0, STDOUT_FILENO, (int *) 0); - /* Clear the scrollback buffer if possible. */ - E3 = tigetstr("E3"); - if (E3) - (void) tputs(E3, lines > 0 ? lines : 1, putch); - - ExitProgram((tputs(clear_screen, lines > 0 ? lines : 1, putch) == ERR) + ExitProgram((clear_cmd() == ERR) ? EXIT_FAILURE : EXIT_SUCCESS); }