ncurses 6.1 - patch 20180317

[ncurses.git] / progs / clear.c

diff --git a/progs/clear.c b/progs/clear.c
index d27b62544a9424ec60118d5817e737815bbbd70f..2ffdf9530948194d7e6a66c562a4a9a812b480a7 100644 (file)
--- a/progs/clear.c
+++ b/progs/clear.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2016,2017 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -29,30 +29,79 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  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
  */
 

-#include <progs.priv.h>
+#define USE_LIBTINFO
+#include <clear_cmd.h>
+#include <tty_settings.h>

 
 

-#include <curses.h>
+MODULE_ID("$Id: clear.c,v 1.22 2017/10/07 21:48:32 tom Exp $")

 
 

-MODULE_ID("$Id: clear.c,v 1.8 1998/09/26 11:42:50 tom Exp $")
+const char *_nc_progname = "clear";

 
 

-static int putch(int c)
+static void
+usage(void)

 {
 {

-       return putchar(c);
+#define KEEP(s) s "\n"
+    static const char msg[] =
+    {
+       KEEP("")
+       KEEP("Options:")
+       KEEP("  -T TERM     use this instead of $TERM")
+       KEEP("  -V          print curses-version")
+       KEEP("  -x          do not try to clear scrollback")
+    };
+#undef KEEP
+    (void) fprintf(stderr, "Usage: %s [options]\n", _nc_progname);
+    fputs(msg, stderr);
+    ExitProgram(EXIT_FAILURE);

 }
 
 }
 

-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);
-       return (tputs(clear_screen, lines > 0 ? lines : 1, putch) == ERR)
+    TTY tty_settings;
+    int fd;
+    int c;
+    char *term;
+    bool opt_x = FALSE;                /* clear scrollback if possible */
+
+    _nc_progname = _nc_rootname(argv[0]);
+    term = getenv("TERM");
+
+    while ((c = getopt(argc, argv, "T:Vx")) != -1) {
+       switch (c) {
+       case 'T':
+           use_env(FALSE);
+           use_tioctl(TRUE);
+           term = optarg;
+           break;
+       case 'V':
+           puts(curses_version());
+           ExitProgram(EXIT_SUCCESS);
+       case 'x':               /* do not try to clear scrollback */
+           opt_x = TRUE;
+           break;
+       default:
+           usage();
+           /* NOTREACHED */
+       }
+    }
+    if (optind < argc)
+       usage();
+
+    fd = save_tty_settings(&tty_settings, FALSE);
+
+    setupterm(term, fd, (int *) 0);
+
+    ExitProgram((clear_cmd(opt_x) == ERR)

                ? EXIT_FAILURE
                ? EXIT_FAILURE

-               : EXIT_SUCCESS;
+               : EXIT_SUCCESS);

 }
 }