*/
#include <tparm_type.h>
+#include <clear_cmd.h>
#include <reset_cmd.h>
#if !PURE_TERMINFO
#endif
#include <transform.h>
-MODULE_ID("$Id: tput.c,v 1.56 2016/08/06 20:59:26 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.63 2016/10/23 01:08:28 tom Exp $")
#define PUTS(s) fputs(s, stdout)
static char *prg_name;
static bool is_init = FALSE;
static bool is_reset = FALSE;
+static bool is_clear = FALSE;
static void
quit(int status, const char *fmt,...)
ExitProgram(EXIT_FAILURE);
}
-static void
-check_aliases(const char *name, bool program)
+static char *
+check_aliases(char *name, bool program)
{
- is_init = same_program(name, program ? PROG_INIT : "init");
- is_reset = same_program(name, program ? PROG_RESET : "reset");
+ static char my_init[] = "init";
+ static char my_reset[] = "reset";
+ static char my_clear[] = "clear";
+
+ char *result = name;
+ if ((is_init = same_program(name, program ? PROG_INIT : my_init)))
+ result = my_init;
+ if ((is_reset = same_program(name, program ? PROG_RESET : my_reset)))
+ result = my_reset;
+ if ((is_clear = same_program(name, program ? PROG_CLEAR : my_clear)))
+ result = my_clear;
+ return result;
}
static int
bool termcap = FALSE;
#endif
- if ((name = argv[0]) == 0)
- name = "";
- check_aliases(name, FALSE);
+ name = check_aliases(argv[0], FALSE);
if (is_reset || is_init) {
+ TTY mode, oldmode;
+
+ int terasechar = -1; /* new erase character */
+ int intrchar = -1; /* new interrupt character */
+ int tkillchar = -1; /* new kill character */
+
+ int my_fd = save_tty_settings(&mode);
+
reset_start(stdout, is_reset, is_init);
- if (send_init_strings((TTY *) 0)) {
+ reset_tty_settings(&mode);
+
+#if HAVE_SIZECHANGE
+ set_window_size(my_fd, &lines, &columns);
+#else
+ (void) my_fd;
+#endif
+ set_control_chars(&mode, terasechar, intrchar, tkillchar);
+ set_conversions(&mode);
+ if (send_init_strings(&oldmode)) {
reset_flush();
}
+
+ update_tty_settings(&oldmode, &mode);
return 0;
}
#if !PURE_TERMINFO
retry:
#endif
- if ((status = tigetflag(name)) != -1) {
+ if (strcmp(name, "clear") == 0) {
+ return clear_cmd();
+ } else if ((status = tigetflag(name)) != -1) {
return exit_code(BOOLEAN, status);
} else if ((status = tigetnum(name)) != CANCELLED_NUMERIC) {
(void) printf("%d\n", status);
char buf[BUFSIZ];
int result = 0;
- check_aliases(prg_name = _nc_rootname(argv[0]), TRUE);
+ prg_name = check_aliases(_nc_rootname(argv[0]), TRUE);
term = getenv("TERM");
/*
* Modify the argument list to omit the options we processed.
*/
- if (is_reset || is_init) {
+ if (is_clear || is_reset || is_init) {
if (optind-- < argc) {
argc -= optind;
argv += optind;
quit(3, "unknown terminal \"%s\"", term);
if (cmdline) {
- if ((argc <= 0) && !is_reset && !is_init)
+ if ((argc <= 0) && !(is_clear || is_reset || is_init))
usage();
ExitProgram(tput_cmd(argc, argv));
}