]> ncurses.scripts.mit.edu Git - ncurses.git/blobdiff - progs/tset.c
ncurses 5.9 - patch 20131027
[ncurses.git] / progs / tset.c
index c7aefbc136df5ada9474be5fda22a61c972e1772..21203e3de07468618ababe2e4d1f38ef961d1a18 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2008,2009 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            *
@@ -119,7 +119,7 @@ char *ttyname(int fd);
 #include <dump_entry.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tset.c,v 1.80 2009/12/12 19:49:03 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,
@@ -141,11 +141,17 @@ MODULE_ID("$Id: tset.c,v 1.80 2009/12/12 19:49:03 tom Exp $")
 # endif
 #endif
 
+#ifndef environ
 extern char **environ;
+#endif
 
 #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;
@@ -158,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 */
+
+#if HAVE_SIZECHANGE
 static int tlines, tcolumns;   /* window size */
+#endif
 
 #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
 
@@ -201,13 +210,13 @@ static void
 failed(const char *msg)
 {
     char temp[BUFSIZ];
-    unsigned len = strlen(_nc_progname) + 2;
+    size_t len = strlen(_nc_progname) + 2;
 
     if ((int) len < (int) sizeof(temp) - 12) {
-       strcpy(temp, _nc_progname);
-       strcat(temp, ": ");
+       _nc_STRCPY(temp, _nc_progname, sizeof(temp));
+       _nc_STRCAT(temp, ": ", sizeof(temp));
     } else {
-       strcpy(temp, "tset: ");
+       _nc_STRCPY(temp, "tset: ", sizeof(temp));
     }
     perror(strncat(temp, msg, sizeof(temp) - strlen(temp) - 2));
     exit_error();
@@ -400,6 +409,10 @@ add_mapping(const char *port, char *arg)
     mapp = typeMalloc(MAP, 1);
     if (copy == 0 || mapp == 0)
        failed("malloc");
+
+    assert(copy != 0);
+    assert(mapp != 0);
+
     mapp->next = 0;
     if (maplist == 0)
        cur = maplist = mapp;
@@ -461,9 +474,6 @@ add_mapping(const char *port, char *arg)
        mapp->speed = tbaudrate(p);
     }
 
-    if (arg == (char *) 0)     /* Non-optional type. */
-       goto badmopt;
-
     mapp->type = arg;
 
     /* Terminate porttype, if specified. */
@@ -521,19 +531,19 @@ mapped(const char *type)
                match = TRUE;
                break;
            case EQ:
-               match = (ospeed == mapp->speed);
+               match = ((int) ospeed == mapp->speed);
                break;
            case GE:
-               match = (ospeed >= mapp->speed);
+               match = ((int) ospeed >= mapp->speed);
                break;
            case GT:
-               match = (ospeed > mapp->speed);
+               match = ((int) ospeed > mapp->speed);
                break;
            case LE:
-               match = (ospeed <= mapp->speed);
+               match = ((int) ospeed <= mapp->speed);
                break;
            case LT:
-               match = (ospeed < mapp->speed);
+               match = ((int) ospeed < mapp->speed);
                break;
            default:
                match = FALSE;
@@ -782,14 +792,14 @@ reset_mode(void)
     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
-                     | IUCLC
+                                 | IUCLC
 #endif
 #ifdef IXANY
-                     | IXANY
+                                 | IXANY
 #endif
-                     | IXOFF);
+                                 | IXOFF));
 
     mode.c_iflag |= (BRKINT | IGNPAR | ICRNL | IXON
 #ifdef IMAXBEL
@@ -797,44 +807,44 @@ reset_mode(void)
 #endif
        );
 
-    mode.c_oflag &= ~(0
+    mode.c_oflag &= ~((unsigned) (0
 #ifdef OLCUC
-                     | OLCUC
+                                 | OLCUC
 #endif
 #ifdef OCRNL
-                     | OCRNL
+                                 | OCRNL
 #endif
 #ifdef ONOCR
-                     | ONOCR
+                                 | ONOCR
 #endif
 #ifdef ONLRET
-                     | ONLRET
+                                 | ONLRET
 #endif
 #ifdef OFILL
-                     | OFILL
+                                 | OFILL
 #endif
 #ifdef OFDEL
-                     | OFDEL
+                                 | OFDEL
 #endif
 #ifdef NLDLY
-                     | NLDLY
+                                 | NLDLY
 #endif
 #ifdef CRDLY
-                     | CRDLY
+                                 | CRDLY
 #endif
 #ifdef TABDLY
-                     | TABDLY
+                                 | TABDLY
 #endif
 #ifdef BSDLY
-                     | BSDLY
+                                 | BSDLY
 #endif
 #ifdef VTDLY
-                     | VTDLY
+                                 | VTDLY
 #endif
 #ifdef FFDLY
-                     | FFDLY
+                                 | FFDLY
 #endif
-       );
+                     ));
 
     mode.c_oflag |= (OPOST
 #ifdef ONLCR
@@ -842,19 +852,19 @@ reset_mode(void)
 #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_lflag &= ~(ECHONL | NOFLSH
+    mode.c_lflag &= ~((unsigned) (ECHONL | NOFLSH
 #ifdef TOSTOP
-                     | TOSTOP
+                                 | TOSTOP
 #endif
 #ifdef ECHOPTR
-                     | ECHOPRT
+                                 | ECHOPRT
 #endif
 #ifdef XCASE
-                     | XCASE
+                                 | XCASE
 #endif
-       );
+                     ));
 
     mode.c_lflag |= (ISIG | ICANON | ECHO | ECHOE | ECHOK
 #ifdef ECHOCTL
@@ -901,14 +911,23 @@ static void
 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
 }
 
@@ -964,9 +983,9 @@ set_conversions(void)
     if (newline != (char *) 0 && newline[0] == '\n' && !newline[1]) {
        /* Newline, not linefeed. */
 #ifdef ONLCR
-       mode.c_oflag &= ~ONLCR;
+       mode.c_oflag &= ~((unsigned) ONLCR);
 #endif
-       mode.c_iflag &= ~ICRNL;
+       mode.c_iflag &= ~((unsigned) ICRNL);
     }
 #ifdef __OBSOLETE__
     if (tgetflag("HD"))                /* Half duplex. */
@@ -1037,11 +1056,18 @@ set_tabs(void)
 {
     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);
 
-       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
@@ -1264,13 +1290,13 @@ main(int argc, char **argv)
        reset_mode();
     }
 
-    ttype = get_termcap_entry(*argv);
+    (void) get_termcap_entry(*argv);
 
     if (!noset) {
+#if HAVE_SIZECHANGE
        tcolumns = columns;
        tlines = lines;
 
-#if HAVE_SIZECHANGE
        if (opt_w) {
            STRUCT_WINSIZE win;
            /* Set window size if not set already */