ncurses 5.9 - patch 20131012

[ncurses.git] / progs / tset.c

diff --git a/progs/tset.c b/progs/tset.c
index b34e47e36c19be70832145be5e222f1dec75067f..21203e3de07468618ababe2e4d1f38ef961d1a18 100644 (file)
--- a/progs/tset.c
+++ b/progs/tset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -32,6 +32,22 @@
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
  *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 

+/*
+ * Notes:
+ * The initial adaptation from 4.4BSD Lite sources in September 1995 used 686
+ * lines from that version, and made changes/additions for 150 lines.  There
+ * was no reformatting, so with/without ignoring whitespace, the amount of
+ * change is the same.
+ *
+ * Comparing with current (2009) source, excluding this comment:
+ * a) 209 lines match identically to the 4.4BSD Lite sources, with 771 lines
+ *    changed/added.
+ * a) Ignoring whitespace, the current version still uses 516 lines from the
+ *    4.4BSD Lite sources, with 402 lines changed/added.
+ *
+ * Raymond's original comment on this follows...
+ */
+

 /*
  * tset.c - terminal initialization utility
  *
 /*
  * tset.c - terminal initialization utility
  *


@@ -52,11 +68,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.

- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors

  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *


@@ -73,6 +85,7 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#define USE_LIBTINFO

 #define __INTERNAL_CAPS_VISIBLE        /* we need to see has_hardware_tabs */
 #include <progs.priv.h>
 
 #define __INTERNAL_CAPS_VISIBLE        /* we need to see has_hardware_tabs */
 #include <progs.priv.h>
 


@@ -88,9 +101,12 @@
 char *ttyname(int fd);
 #endif
 
 char *ttyname(int fd);
 #endif
 

-/* this is just to stifle a missing-prototype warning */
-#ifdef linux
-# include <sys/ioctl.h>
+#if HAVE_SIZECHANGE
+# if !defined(sun) || !TERMIOS
+#  if HAVE_SYS_IOCTL_H
+#   include <sys/ioctl.h>
+#  endif
+# endif

 #endif
 
 #if NEED_PTEM_H
 #endif
 
 #if NEED_PTEM_H


@@ -103,13 +119,39 @@ char *ttyname(int fd);
 #include <dump_entry.h>
 #include <transform.h>
 
 #include <dump_entry.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tset.c,v 1.68 2007/07/21 17:46:24 tom Exp $")
+MODULE_ID("$Id: tset.c,v 1.92 2013/10/12 22:17:20 tom Exp $")
+
+/*
+ * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
+ * Solaris, IRIX) define TIOCGWINSZ and struct winsize.
+ */
+#ifdef TIOCGSIZE
+# define IOCTL_GET_WINSIZE TIOCGSIZE
+# define IOCTL_SET_WINSIZE TIOCSSIZE
+# define STRUCT_WINSIZE struct ttysize
+# define WINSIZE_ROWS(n) n.ts_lines
+# define WINSIZE_COLS(n) n.ts_cols
+#else
+# ifdef TIOCGWINSZ
+#  define IOCTL_GET_WINSIZE TIOCGWINSZ
+#  define IOCTL_SET_WINSIZE TIOCSWINSZ
+#  define STRUCT_WINSIZE struct winsize
+#  define WINSIZE_ROWS(n) n.ws_row
+#  define WINSIZE_COLS(n) n.ws_col
+# endif
+#endif

 
 

+#ifndef environ

 extern char **environ;
 extern char **environ;

+#endif

 
 #undef CTRL
 #define CTRL(x)        ((x) & 0x1f)
 
 
 #undef CTRL
 #define CTRL(x)        ((x) & 0x1f)
 

+static void failed(const char *) GCC_NORETURN;
+static void exit_error(void) GCC_NORETURN;
+static void err(const char *,...) GCC_NORETURN;
+

 const char *_nc_progname = "tset";
 
 static TTY mode, oldmode, original;
 const char *_nc_progname = "tset";
 
 static TTY mode, oldmode, original;


@@ -122,7 +164,10 @@ static bool isreset = FALSE;       /* invoked as reset */
 static int terasechar = -1;    /* new erase character */
 static int intrchar = -1;      /* new interrupt character */
 static int tkillchar = -1;     /* new kill character */
 static int terasechar = -1;    /* new erase character */
 static int intrchar = -1;      /* new interrupt character */
 static int tkillchar = -1;     /* new kill character */

+
+#if HAVE_SIZECHANGE

 static int tlines, tcolumns;   /* window size */
 static int tlines, tcolumns;   /* window size */

+#endif

 
 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 
 
 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 


@@ -165,13 +210,13 @@ static void
 failed(const char *msg)
 {
     char temp[BUFSIZ];
 failed(const char *msg)
 {
     char temp[BUFSIZ];

-    unsigned len = strlen(_nc_progname) + 2;
+    size_t len = strlen(_nc_progname) + 2;

 
 

-    if (len < sizeof(temp) - 12) {
-       strcpy(temp, _nc_progname);
-       strcat(temp, ": ");
+    if ((int) len < (int) sizeof(temp) - 12) {
+       _nc_STRCPY(temp, _nc_progname, sizeof(temp));
+       _nc_STRCAT(temp, ": ", sizeof(temp));

     } else {
     } else {

-       strcpy(temp, "tset: ");
+       _nc_STRCPY(temp, "tset: ", sizeof(temp));

     }
     perror(strncat(temp, msg, sizeof(temp) - strlen(temp) - 2));
     exit_error();
     }
     perror(strncat(temp, msg, sizeof(temp) - strlen(temp) - 2));
     exit_error();


@@ -361,9 +406,13 @@ add_mapping(const char *port, char *arg)
     char *base = 0;
 
     copy = strdup(arg);
     char *base = 0;
 
     copy = strdup(arg);

-    mapp = (MAP *) malloc(sizeof(MAP));
+    mapp = typeMalloc(MAP, 1);

     if (copy == 0 || mapp == 0)
        failed("malloc");
     if (copy == 0 || mapp == 0)
        failed("malloc");

+
+    assert(copy != 0);
+    assert(mapp != 0);
+

     mapp->next = 0;
     if (maplist == 0)
        cur = maplist = mapp;
     mapp->next = 0;
     if (maplist == 0)
        cur = maplist = mapp;


@@ -425,9 +474,6 @@ add_mapping(const char *port, char *arg)
        mapp->speed = tbaudrate(p);
     }
 
        mapp->speed = tbaudrate(p);
     }
 

-    if (arg == (char *) 0)     /* Non-optional type. */
-       goto badmopt;
-

     mapp->type = arg;
 
     /* Terminate porttype, if specified. */
     mapp->type = arg;
 
     /* Terminate porttype, if specified. */


@@ -439,11 +485,15 @@ add_mapping(const char *port, char *arg)
        mapp->conditional = ~mapp->conditional & (EQ | GT | LT);
 
     /* If user specified a port with an option flag, set it. */
        mapp->conditional = ~mapp->conditional & (EQ | GT | LT);
 
     /* If user specified a port with an option flag, set it. */

-  done:if (port) {
-       if (mapp->porttype)
-         badmopt:err("illegal -m option format: %s", copy);
+  done:
+    if (port) {
+       if (mapp->porttype) {
+         badmopt:
+           err("illegal -m option format: %s", copy);
+       }

        mapp->porttype = port;
     }
        mapp->porttype = port;
     }

+    free(copy);

 #ifdef MAPDEBUG
     (void) printf("port: %s\n", mapp->porttype ? mapp->porttype : "ANY");
     (void) printf("type: %s\n", mapp->type);
 #ifdef MAPDEBUG
     (void) printf("port: %s\n", mapp->porttype ? mapp->porttype : "ANY");
     (void) printf("type: %s\n", mapp->type);


@@ -481,19 +531,19 @@ mapped(const char *type)
                match = TRUE;
                break;
            case EQ:
                match = TRUE;
                break;
            case EQ:

-               match = (ospeed == mapp->speed);
+               match = ((int) ospeed == mapp->speed);

                break;
            case GE:
                break;
            case GE:

-               match = (ospeed >= mapp->speed);
+               match = ((int) ospeed >= mapp->speed);

                break;
            case GT:
                break;
            case GT:

-               match = (ospeed > mapp->speed);
+               match = ((int) ospeed > mapp->speed);

                break;
            case LE:
                break;
            case LE:

-               match = (ospeed <= mapp->speed);
+               match = ((int) ospeed <= mapp->speed);

                break;
            case LT:
                break;
            case LT:

-               match = (ospeed < mapp->speed);
+               match = ((int) ospeed < mapp->speed);

                break;
            default:
                match = FALSE;
                break;
            default:
                match = FALSE;


@@ -742,14 +792,14 @@ reset_mode(void)
     mode.c_cc[VWERASE] = CHK(mode.c_cc[VWERASE], CWERASE);
 #endif
 
     mode.c_cc[VWERASE] = CHK(mode.c_cc[VWERASE], CWERASE);
 #endif
 

-    mode.c_iflag &= ~(IGNBRK | PARMRK | INPCK | ISTRIP | INLCR | IGNCR
+    mode.c_iflag &= ~((unsigned) (IGNBRK | PARMRK | INPCK | ISTRIP | INLCR | IGNCR

 #ifdef IUCLC
 #ifdef IUCLC

-                     | IUCLC
+                                 | IUCLC

 #endif
 #ifdef IXANY
 #endif
 #ifdef IXANY

-                     | IXANY
+                                 | IXANY

 #endif
 #endif

-                     | IXOFF);
+                                 | IXOFF));

 
     mode.c_iflag |= (BRKINT | IGNPAR | ICRNL | IXON
 #ifdef IMAXBEL
 
     mode.c_iflag |= (BRKINT | IGNPAR | ICRNL | IXON
 #ifdef IMAXBEL


@@ -757,29 +807,44 @@ reset_mode(void)
 #endif
        );
 
 #endif
        );
 

-    mode.c_oflag &= ~(0
+    mode.c_oflag &= ~((unsigned) (0

 #ifdef OLCUC
 #ifdef OLCUC

-                     | OLCUC
+                                 | OLCUC

 #endif
 #ifdef OCRNL
 #endif
 #ifdef OCRNL

-                     | OCRNL
+                                 | OCRNL

 #endif
 #ifdef ONOCR
 #endif
 #ifdef ONOCR

-                     | ONOCR
+                                 | ONOCR

 #endif
 #ifdef ONLRET
 #endif
 #ifdef ONLRET

-                     | ONLRET
+                                 | ONLRET

 #endif
 #ifdef OFILL
 #endif
 #ifdef OFILL

-                     | OFILL
+                                 | OFILL

 #endif
 #ifdef OFDEL
 #endif
 #ifdef OFDEL

-                     | OFDEL
+                                 | OFDEL

 #endif
 #ifdef NLDLY
 #endif
 #ifdef NLDLY

-                     | NLDLY | CRDLY | TABDLY | BSDLY | VTDLY | FFDLY
+                                 | NLDLY

 #endif
 #endif

-       );
+#ifdef CRDLY
+                                 | CRDLY
+#endif
+#ifdef TABDLY
+                                 | TABDLY
+#endif
+#ifdef BSDLY
+                                 | BSDLY
+#endif
+#ifdef VTDLY
+                                 | VTDLY
+#endif
+#ifdef FFDLY
+                                 | FFDLY
+#endif
+                     ));

 
     mode.c_oflag |= (OPOST
 #ifdef ONLCR
 
     mode.c_oflag |= (OPOST
 #ifdef ONLCR


@@ -787,19 +852,19 @@ reset_mode(void)
 #endif
        );
 
 #endif
        );
 

-    mode.c_cflag &= ~(CSIZE | CSTOPB | PARENB | PARODD | CLOCAL);
+    mode.c_cflag &= ~((unsigned) (CSIZE | CSTOPB | PARENB | PARODD | CLOCAL));

     mode.c_cflag |= (CS8 | CREAD);
     mode.c_cflag |= (CS8 | CREAD);

-    mode.c_lflag &= ~(ECHONL | NOFLSH
+    mode.c_lflag &= ~((unsigned) (ECHONL | NOFLSH

 #ifdef TOSTOP
 #ifdef TOSTOP

-                     | TOSTOP
+                                 | TOSTOP

 #endif
 #ifdef ECHOPTR
 #endif
 #ifdef ECHOPTR

-                     | ECHOPRT
+                                 | ECHOPRT

 #endif
 #ifdef XCASE
 #endif
 #ifdef XCASE

-                     | XCASE
+                                 | XCASE

 #endif
 #endif

-       );
+                     ));

 
     mode.c_lflag |= (ISIG | ICANON | ECHO | ECHOE | ECHOK
 #ifdef ECHOCTL
 
     mode.c_lflag |= (ISIG | ICANON | ECHO | ECHOE | ECHOK
 #ifdef ECHOCTL


@@ -846,14 +911,23 @@ static void
 set_control_chars(void)
 {
 #ifdef TERMIOS
 set_control_chars(void)
 {
 #ifdef TERMIOS

-    if (DISABLED(mode.c_cc[VERASE]) || terasechar >= 0)
-       mode.c_cc[VERASE] = terasechar >= 0 ? terasechar : default_erase();
+    if (DISABLED(mode.c_cc[VERASE]) || terasechar >= 0) {
+       mode.c_cc[VERASE] = UChar((terasechar >= 0)
+                                 ? terasechar
+                                 : default_erase());
+    }

 
 

-    if (DISABLED(mode.c_cc[VINTR]) || intrchar >= 0)
-       mode.c_cc[VINTR] = intrchar >= 0 ? intrchar : CINTR;
+    if (DISABLED(mode.c_cc[VINTR]) || intrchar >= 0) {
+       mode.c_cc[VINTR] = UChar((intrchar >= 0)
+                                ? intrchar
+                                : CINTR);
+    }

 
 

-    if (DISABLED(mode.c_cc[VKILL]) || tkillchar >= 0)
-       mode.c_cc[VKILL] = tkillchar >= 0 ? tkillchar : CKILL;
+    if (DISABLED(mode.c_cc[VKILL]) || tkillchar >= 0) {
+       mode.c_cc[VKILL] = UChar((tkillchar >= 0)
+                                ? tkillchar
+                                : CKILL);
+    }

 #endif
 }
 
 #endif
 }
 


@@ -909,9 +983,9 @@ set_conversions(void)
     if (newline != (char *) 0 && newline[0] == '\n' && !newline[1]) {
        /* Newline, not linefeed. */
 #ifdef ONLCR
     if (newline != (char *) 0 && newline[0] == '\n' && !newline[1]) {
        /* Newline, not linefeed. */
 #ifdef ONLCR

-       mode.c_oflag &= ~ONLCR;
+       mode.c_oflag &= ~((unsigned) ONLCR);

 #endif
 #endif

-       mode.c_iflag &= ~ICRNL;
+       mode.c_iflag &= ~((unsigned) ICRNL);

     }
 #ifdef __OBSOLETE__
     if (tgetflag("HD"))                /* Half duplex. */
     }
 #ifdef __OBSOLETE__
     if (tgetflag("HD"))                /* Half duplex. */


@@ -982,11 +1056,18 @@ set_tabs(void)
 {
     if (set_tab && clear_all_tabs) {
        int c;
 {
     if (set_tab && clear_all_tabs) {
        int c;

+       int lim =
+#if HAVE_SIZECHANGE
+       tcolumns
+#else
+       columns
+#endif
+        ;

 
        (void) putc('\r', stderr);      /* Force to left margin. */
        tputs(clear_all_tabs, 0, outc);
 
 
        (void) putc('\r', stderr);      /* Force to left margin. */
        tputs(clear_all_tabs, 0, outc);
 

-       for (c = 8; c < tcolumns; c += 8) {
+       for (c = 8; c < lim; c += 8) {

            /* Get to the right column.  In BSD tset, this
             * used to try a bunch of half-clever things
             * with cup and hpa, for an average saving of
            /* Get to the right column.  In BSD tset, this
             * used to try a bunch of half-clever things
             * with cup and hpa, for an average saving of


@@ -1112,17 +1193,14 @@ usage(void)
 static char
 arg_to_char(void)
 {
 static char
 arg_to_char(void)
 {

-    return (optarg[0] == '^' && optarg[1] != '\0')
-       ? ((optarg[1] == '?') ? '\177' : CTRL(optarg[1]))
-       : optarg[0];
+    return (char) ((optarg[0] == '^' && optarg[1] != '\0')
+                  ? ((optarg[1] == '?') ? '\177' : CTRL(optarg[1]))
+                  : optarg[0]);

 }
 
 int
 main(int argc, char **argv)
 {
 }
 
 int
 main(int argc, char **argv)
 {

-#if defined(TIOCGWINSZ) && defined(TIOCSWINSZ)
-    struct winsize win;
-#endif

     int ch, noinit, noset, quiet, Sflag, sflag, showterm;
     const char *p;
     const char *ttype;
     int ch, noinit, noset, quiet, Sflag, sflag, showterm;
     const char *p;
     const char *ttype;


@@ -1202,31 +1280,33 @@ main(int argc, char **argv)
     can_restore = TRUE;
     original = oldmode = mode;
 #ifdef TERMIOS
     can_restore = TRUE;
     original = oldmode = mode;
 #ifdef TERMIOS

-    ospeed = cfgetospeed(&mode);
+    ospeed = (NCURSES_OSPEED) cfgetospeed(&mode);

 #else
 #else

-    ospeed = mode.sg_ospeed;
+    ospeed = (NCURSES_OSPEED) mode.sg_ospeed;

 #endif
 
 #endif
 

-    if (!strcmp(_nc_progname, PROG_RESET)) {
+    if (same_program(_nc_progname, PROG_RESET)) {

        isreset = TRUE;
        reset_mode();
     }
 
        isreset = TRUE;
        reset_mode();
     }
 

-    ttype = get_termcap_entry(*argv);
+    (void) get_termcap_entry(*argv);

 
     if (!noset) {
 
     if (!noset) {

+#if HAVE_SIZECHANGE

        tcolumns = columns;
        tlines = lines;
 
        tcolumns = columns;
        tlines = lines;
 

-#if defined(TIOCGWINSZ) && defined(TIOCSWINSZ)

        if (opt_w) {
        if (opt_w) {

-           /* Set window size */
-           (void) ioctl(STDERR_FILENO, TIOCGWINSZ, &win);
-           if (win.ws_row == 0 && win.ws_col == 0 &&
+           STRUCT_WINSIZE win;
+           /* Set window size if not set already */
+           (void) ioctl(STDERR_FILENO, IOCTL_GET_WINSIZE, &win);
+           if (WINSIZE_ROWS(win) == 0 &&
+               WINSIZE_COLS(win) == 0 &&

                tlines > 0 && tcolumns > 0) {
                tlines > 0 && tcolumns > 0) {

-               win.ws_row = tlines;
-               win.ws_col = tcolumns;
-               (void) ioctl(STDERR_FILENO, TIOCSWINSZ, &win);
+               WINSIZE_ROWS(win) = tlines;
+               WINSIZE_COLS(win) = tcolumns;
+               (void) ioctl(STDERR_FILENO, IOCTL_SET_WINSIZE, &win);

            }
        }
 #endif
            }
        }
 #endif


@@ -1277,7 +1357,7 @@ main(int argc, char **argv)
         * environmental variable SHELL ending in "csh".
         */
        if ((var = getenv("SHELL")) != 0
         * environmental variable SHELL ending in "csh".
         */
        if ((var = getenv("SHELL")) != 0

-           && ((len = strlen(leaf = _nc_basename(var))) >= 3)
+           && ((len = (int) strlen(leaf = _nc_basename(var))) >= 3)

            && !strcmp(leaf + len - 3, "csh"))
            p = "set noglob;\nsetenv TERM %s;\nunset noglob;\n";
        else
            && !strcmp(leaf + len - 3, "csh"))
            p = "set noglob;\nsetenv TERM %s;\nunset noglob;\n";
        else