ncurses 5.9 - patch 20131012

[ncurses.git] / progs / tset.c

diff --git a/progs/tset.c b/progs/tset.c
index 7189d00c88826e2013c440ebf701e684f02e8938..21203e3de07468618ababe2e4d1f38ef961d1a18 100644 (file)
--- a/progs/tset.c
+++ b/progs/tset.c
@@ -119,7 +119,7 @@ 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.91 2013/03/23 21:38:08 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,
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,


@@ -792,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


@@ -807,44 +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
+                                 | NLDLY

 #endif
 #ifdef CRDLY
 #endif
 #ifdef CRDLY

-                     | CRDLY
+                                 | CRDLY

 #endif
 #ifdef TABDLY
 #endif
 #ifdef TABDLY

-                     | TABDLY
+                                 | TABDLY

 #endif
 #ifdef BSDLY
 #endif
 #ifdef BSDLY

-                     | BSDLY
+                                 | BSDLY

 #endif
 #ifdef VTDLY
 #endif
 #ifdef VTDLY

-                     | VTDLY
+                                 | VTDLY

 #endif
 #ifdef FFDLY
 #endif
 #ifdef FFDLY

-                     | FFDLY
+                                 | FFDLY

 #endif
 #endif

-       );
+                     ));

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


@@ -852,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


@@ -911,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
 }
 


@@ -974,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. */