ncurses 6.0 - patch 20160820

[ncurses.git] / progs / clear.c

diff --git a/progs/clear.c b/progs/clear.c
index da30bcc4a3c6b1d64908dd3a99090808f99c3800..4ac503ed3641570468eac4a4e00bab24ecc74400 100644 (file)
--- a/progs/clear.c
+++ b/progs/clear.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,2005 Free Software Foundation, Inc.                   *
+ * Copyright (c) 1998-2007,2013 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            *
@@ -29,28 +29,39 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-
 /*
  * clear.c --  clears the terminal's screen
  */
 
+#define USE_LIBTINFO
 #include <progs.priv.h>
 
-MODULE_ID("$Id: clear.c,v 1.9 2005/09/25 00:46:43 tom Exp $")
+MODULE_ID("$Id: clear.c,v 1.13 2013/06/22 22:20:54 tom Exp $")
 
-static int putch(int c)
+static int
+putch(int c)
 {
-       return putchar(c);
+    return putchar(c);
 }
 
-int main(
+int
+main(
        int argc GCC_UNUSED,
-       char *argv[] GCC_UNUSED)
+       char *argv[]GCC_UNUSED)
 {
-       setupterm((char *) 0, STDOUT_FILENO, (int *) 0);
-       return (tputs(clear_screen, lines > 0 ? lines : 1, putch) == ERR)
+    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)
                ? EXIT_FAILURE
-               : EXIT_SUCCESS;
+               : EXIT_SUCCESS);
 }