ncurses 5.9 - patch 20111217

[ncurses.git] / progs / tset.c

diff --git a/progs/tset.c b/progs/tset.c
index 084e41d6db249c6812efe8d71eca30b0dbab9ccd..1a963bcd16aa9e5ccf94cf8aa0ad2ae7fc976117 100644 (file)
--- a/progs/tset.c
+++ b/progs/tset.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2011 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            *


@@ -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.82 2010/05/01 21:42:46 tom Exp $")
+MODULE_ID("$Id: tset.c,v 1.85 2011/12/10 15:41:34 tom Exp $")

 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,
 
 /*
  * SCO defines TIOCGSIZE and the corresponding struct.  Other systems (SunOS,


@@ -148,6 +148,10 @@ extern char **environ;
 #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;


@@ -160,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))
 


@@ -203,7 +210,7 @@ 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 ((int) len < (int) sizeof(temp) - 12) {
        strcpy(temp, _nc_progname);
 
     if ((int) len < (int) sizeof(temp) - 12) {
        strcpy(temp, _nc_progname);


@@ -1273,10 +1280,10 @@ main(int argc, char **argv)
     (void) get_termcap_entry(*argv);
 
     if (!noset) {
     (void) get_termcap_entry(*argv);
 
     if (!noset) {

+#if HAVE_SIZECHANGE

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

-#if HAVE_SIZECHANGE

        if (opt_w) {
            STRUCT_WINSIZE win;
            /* Set window size if not set already */
        if (opt_w) {
            STRUCT_WINSIZE win;
            /* Set window size if not set already */