ncurses 5.7 - patch 20091031

[ncurses.git] / progs / clear.c

diff --git a/progs/clear.c b/progs/clear.c
index 417c2446b7a9c6bd051b84be7127d2f017efc50c..9f5a543848a12c50995cfc3607e17176e142f570 100644 (file)
--- a/progs/clear.c
+++ b/progs/clear.c
@@ -1,47 +1,59 @@
-
-/***************************************************************************
-*                            COPYRIGHT NOTICE                              *
-****************************************************************************
-*                ncurses is copyright (C) 1992-1995                        *
-*                          Zeyd M. Ben-Halim                               *
-*                          zmbenhal@netcom.com                             *
-*                          Eric S. Raymond                                 *
-*                          esr@snark.thyrsus.com                           *
-*                                                                          *
-*        Permission is hereby granted to reproduce and distribute ncurses  *
-*        by any means and for any fee, whether alone or as part of a       *
-*        larger distribution, in source or in binary form, PROVIDED        *
-*        this notice is included with any such distribution, and is not    *
-*        removed from any of its header files. Mention of ncurses in any   *
-*        applications linked with it is highly appreciated.                *
-*                                                                          *
-*        ncurses comes AS IS with no warranty, implied or expressed.       *
-*                                                                          *
-***************************************************************************/
-
+/****************************************************************************
+ * Copyright (c) 1998-2006,2007 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            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
+
+/****************************************************************************
+ *  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
  */
 
 
 /*
  * clear.c --  clears the terminal's screen
  */
 

+#define USE_LIBTINFO

 #include <progs.priv.h>
 
 #include <progs.priv.h>
 

-#include <curses.h>
-
-MODULE_ID("$Id: clear.c,v 1.6 1996/12/21 17:35:11 tom Exp $")
+MODULE_ID("$Id: clear.c,v 1.11 2007/10/13 22:16:02 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,
        int argc GCC_UNUSED,

-       char *argv[] GCC_UNUSED)
+       char *argv[]GCC_UNUSED)

 {
 {

-       setupterm((char *) 0, STDOUT_FILENO, (int *) 0);
-       if (clear_screen == (char *) 0)
-               return EXIT_FAILURE;
-       tputs(clear_screen, lines > 0 ? lines : 1, putch);
-       return EXIT_SUCCESS;
+    setupterm((char *) 0, STDOUT_FILENO, (int *) 0);
+    ExitProgram((tputs(clear_screen, lines > 0 ? lines : 1, putch) == ERR)
+               ? EXIT_FAILURE
+               : EXIT_SUCCESS);

 }
 }