X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftset.c;h=ca0520e215a1df49b9bf1c8134bdb855724825bd;hp=029207678738564b26597c4b1c2a5a7f52212872;hb=73dd18dba5148d708638caa25c085d82f704e972;hpb=96592d717179f99c8fe1c5a63fc4a26c24867288 diff --git a/progs/tset.c b/progs/tset.c index 02920767..ca0520e2 100644 --- a/progs/tset.c +++ b/progs/tset.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc. * + * Copyright 2020 Thomas E. Dickey * + * Copyright 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 * @@ -88,6 +89,7 @@ #include #include #include +#include #if HAVE_GETTTYNAM && HAVE_TTYENT_H #include @@ -96,7 +98,7 @@ char *ttyname(int fd); #endif -MODULE_ID("$Id: tset.c,v 1.107 2016/08/06 20:54:22 tom Exp $") +MODULE_ID("$Id: tset.c,v 1.121 2020/02/02 23:34:34 tom Exp $") #ifndef environ extern char **environ; @@ -106,6 +108,8 @@ const char *_nc_progname = "tset"; #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c)) +static void exit_error(void) GCC_NORETURN; + static int CaselessCmp(const char *a, const char *b) { /* strcasecmp isn't portable */ @@ -152,7 +156,8 @@ failed(const char *msg) } else { _nc_STRCPY(temp, "tset: ", sizeof(temp)); } - perror(strncat(temp, msg, sizeof(temp) - strlen(temp) - 2)); + _nc_STRNCAT(temp, msg, sizeof(temp), sizeof(temp) - strlen(temp) - 2); + perror(temp); exit_error(); /* NOTREACHED */ } @@ -273,15 +278,57 @@ static const SPEEDS speeds[] = #ifdef B57600 DATA("57600", B57600), #endif +#ifdef B76800 + DATA("76800", B57600), +#endif #ifdef B115200 DATA("115200", B115200), #endif +#ifdef B153600 + DATA("153600", B153600), +#endif #ifdef B230400 DATA("230400", B230400), #endif +#ifdef B307200 + DATA("307200", B307200), +#endif #ifdef B460800 DATA("460800", B460800), #endif +#ifdef B500000 + DATA("500000", B500000), +#endif +#ifdef B576000 + DATA("576000", B576000), +#endif +#ifdef B921600 + DATA("921600", B921600), +#endif +#ifdef B1000000 + DATA("1000000", B1000000), +#endif +#ifdef B1152000 + DATA("1152000", B1152000), +#endif +#ifdef B1500000 + DATA("1500000", B1500000), +#endif +#ifdef B2000000 + DATA("2000000", B2000000), +#endif +#ifdef B2500000 + DATA("2500000", B2500000), +#endif +#ifdef B3000000 + DATA("3000000", B3000000), +#endif +#ifdef B3500000 + DATA("3500000", B3500000), +#endif +#ifdef B4000000 + DATA("4000000", B4000000), +#endif }; #undef DATA @@ -296,6 +343,10 @@ tbaudrate(char *rate) ++rate; for (n = 0; n < SIZEOF(speeds); ++n) { + if (n > 0 && (speeds[n].speed <= speeds[n - 1].speed)) { + /* if the speeds are not increasing, likely a numeric overflow */ + break; + } if (!CaselessCmp(rate, speeds[n].string)) { sp = speeds + n; break; @@ -492,6 +543,8 @@ get_termcap_entry(int fd, char *userarg) #endif char *ttypath; + (void) fd; + if (userarg) { ttype = userarg; goto found; @@ -576,7 +629,7 @@ get_termcap_entry(int fd, char *userarg) ttype = askuser(0); } /* Find the terminfo entry. If it doesn't exist, ask the user. */ - while (setupterm((NCURSES_CONST char *) ttype, STDOUT_FILENO, &errret) + while (setupterm((NCURSES_CONST char *) ttype, fd, &errret) != OK) { if (errret == 0) { (void) fprintf(stderr, "%s: unknown terminal type %s\n", @@ -659,27 +712,36 @@ print_shell_commands(const char *ttype) static void usage(void) { -#define DATA(s) s "\n" +#define SKIP(s) /* nothing */ +#define KEEP(s) s "\n" static const char msg[] = { - DATA("") - DATA("Options:") - DATA(" -c set control characters") - DATA(" -e ch erase character") - DATA(" -I no initialization strings") - DATA(" -i ch interrupt character") - DATA(" -k ch kill character") - DATA(" -m mapping map identifier to type") - DATA(" -Q do not output control key settings") - DATA(" -r display term on stderr") - DATA(" -s output TERM set command") - DATA(" -V print curses-version") - DATA(" -w set window-size") + KEEP("") + KEEP("Options:") + SKIP(" -a arpanet (obsolete)") + KEEP(" -c set control characters") + SKIP(" -d dialup (obsolete)") + KEEP(" -e ch erase character") + KEEP(" -I no initialization strings") + KEEP(" -i ch interrupt character") + KEEP(" -k ch kill character") + KEEP(" -m mapping map identifier to type") + SKIP(" -p plugboard (obsolete)") + KEEP(" -Q do not output control key settings") + KEEP(" -q display term only, do no changes") + KEEP(" -r display term on stderr") + SKIP(" -S (obsolete)") + KEEP(" -s output TERM set command") + KEEP(" -V print curses-version") + KEEP(" -w set window-size") + KEEP("") + KEEP("If neither -c/-w are given, both are assumed.") }; -#undef DATA +#undef KEEP +#undef SKIP (void) fprintf(stderr, "Usage: %s [options] [terminal]\n", _nc_progname); fputs(msg, stderr); - exit_error(); + ExitProgram(EXIT_FAILURE); /* NOTREACHED */ } @@ -699,7 +761,7 @@ main(int argc, char **argv) int terasechar = -1; /* new erase character */ int intrchar = -1; /* new interrupt character */ int tkillchar = -1; /* new kill character */ - int my_fd = -1; + int my_fd; bool opt_c = FALSE; /* set control-chars */ bool opt_w = FALSE; /* set window-size */ TTY mode, oldmode; @@ -707,7 +769,7 @@ main(int argc, char **argv) my_fd = STDERR_FILENO; obsolete(argv); noinit = noset = quiet = Sflag = sflag = showterm = 0; - while ((ch = getopt(argc, argv, "a:cd:e:Ii:k:m:p:qQSrsVw")) != -1) { + while ((ch = getopt(argc, argv, "a:cd:e:Ii:k:m:p:qQrSsVw")) != -1) { switch (ch) { case 'c': /* set control-chars */ opt_c = TRUE; @@ -773,7 +835,7 @@ main(int argc, char **argv) if (!opt_c && !opt_w) opt_c = opt_w = TRUE; - my_fd = save_tty_settings(&mode); + my_fd = save_tty_settings(&mode, TRUE); oldmode = mode; #ifdef TERMIOS ospeed = (NCURSES_OSPEED) cfgetospeed(&mode); @@ -783,9 +845,9 @@ main(int argc, char **argv) if (same_program(_nc_progname, PROG_RESET)) { reset_start(stderr, TRUE, FALSE); - reset_tty_settings(&mode); + reset_tty_settings(my_fd, &mode); } else { - reset_start(stderr, FALSE, FALSE); + reset_start(stderr, FALSE, TRUE); } ttype = get_termcap_entry(my_fd, *argv); @@ -793,7 +855,7 @@ main(int argc, char **argv) if (!noset) { #if HAVE_SIZECHANGE if (opt_w) { - set_window_size(my_fd, lines, columns); + set_window_size(my_fd, &lines, &columns); } #endif if (opt_c) { @@ -801,7 +863,7 @@ main(int argc, char **argv) set_conversions(&mode); if (!noinit) { - if (send_init_strings(&oldmode)) { + if (send_init_strings(my_fd, &oldmode)) { (void) putc('\r', stderr); (void) fflush(stderr); (void) napms(1000); /* Settle the terminal. */