ncurses 6.1 - patch 20180630

+ add acsc string to vi200 (Nibby Nebbulous)
  add right/down-arrow to vi200's acsc -TD
+ add "x" to tput's getopt string so that "tput -x clear" works
  (Nicholas Marriott).
+ minor fixes prompted by anonymous report on stack overflow:
  + correct order of checks in _nc_get_locale(), for systems lacking
    locale support.
  + add "#error" in a few places to flag unsupported configurations

diff --git a/NEWS b/NEWS
index be4ac3fb1c8cfe322fd7701f4367a41a5a2d6853..11a1047dfd34b740a710977294bc13f406012f1e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.3150 2018/06/24 00:15:39 tom Exp $
+-- $Id: NEWS,v 1.3152 2018/06/30 20:45:08 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,16 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20180630
+       + add acsc string to vi200 (Nibby Nebbulous)
+         add right/down-arrow to vi200's acsc -TD
+       + add "x" to tput's getopt string so that "tput -x clear" works
+         (Nicholas Marriott).
+       + minor fixes prompted by anonymous report on stack overflow:
+         + correct order of checks in _nc_get_locale(), for systems lacking
+           locale support.
+         + add "#error" in a few places to flag unsupported configurations
+

 20180623
        + use _WIN32/_WIN64 in preference to __MINGW32__/__MINGW64__ symbols
          to simplify building with MSVC, since the former are defined in both
 20180623
        + use _WIN32/_WIN64 in preference to __MINGW32__/__MINGW64__ symbols
          to simplify building with MSVC, since the former are defined in both

diff --git a/VERSION b/VERSION
index 582e1ea71723420658c0af1f8c927567205a4e78..ffdf3468db1167e7da0c499cc068b0385ca5daf8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.1     20180623
+5:0:10 6.1     20180630

diff --git a/dist.mk b/dist.mk
index 4bd5bf04d07475b6a1bc63a4912c33aa08eeab0b..10638cb202a02becab8801f251f507ddb50df03e 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.1229 2018/06/18 20:36:58 tom Exp $
+# $Id: dist.mk,v 1.1230 2018/06/30 15:17:22 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 1
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 1

-NCURSES_PATCH = 20180623
+NCURSES_PATCH = 20180630

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/man/terminfo.head b/man/terminfo.head
index 24d4e2a5621a0ad43febd4375f7384bb0a4d4cad..7418a3584df44280edf9b6037f8f68a479a73833 100644 (file)
--- a/man/terminfo.head
+++ b/man/terminfo.head
@@ -1,5 +1,5 @@
 .\"***************************************************************************
 .\"***************************************************************************

-.\" Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+.\" Copyright (c) 1998-2017,2018 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            *


@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: terminfo.head,v 1.33 2018/05/19 20:57:27 tom Exp $
+.\" $Id: terminfo.head,v 1.34 2018/05/19 20:57:27 tom Exp $

 .TH terminfo 5 "" "" "File Formats"
 .ds n 5
 .ds d @TERMINFO@
 .TH terminfo 5 "" "" "File Formats"
 .ds n 5
 .ds d @TERMINFO@

diff --git a/misc/terminfo.src b/misc/terminfo.src
index 0ba7d5c49102899f44d580378ca998994a8ae37d..1998d5d7b76647304e75a6c154d17291366b4796 100644 (file)
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -6,8 +6,8 @@
 # Report bugs and new terminal descriptions to
 #      bug-ncurses@gnu.org
 #
 # Report bugs and new terminal descriptions to
 #      bug-ncurses@gnu.org
 #

-#      $Revision: 1.699 $
-#      $Date: 2018/05/19 20:10:26 $
+#      $Revision: 1.702 $
+#      $Date: 2018/06/30 17:32:07 $

 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually
 #
 # The original header is preserved below for reference.  It is noted that there
 # is a "newer" version which differs in some cosmetic details (but actually


@@ -10579,18 +10579,18 @@ vi55|Visual 55,
 vi200|visual 200,
        OTbs, OTpt, am, mir, msgr,
        OTkn#10, cols#80, it#8, lines#24,
 vi200|visual 200,
        OTbs, OTpt, am, mir, msgr,
        OTkn#10, cols#80, it#8, lines#24,

-       acsc=, bel=^G, cbt=\Ez, clear=\Ev, cnorm=\Ec, cr=\r, cub1=^H,
-       cud1=\n, cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c,
-       cuu1=\EA, cvvis=\Ed, dch1=\EO, dim=\E4, dl1=\EM, ed=\Ey,
-       el=\Ex, home=\EH, ht=^I, hts=\E1, il1=\EL, ind=\n, invis=\Ea,
-       kbs=^H, kclr=\Ev, kctab=\E2, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-       kcuu1=\EA, kdch1=\EO, kdl1=\EM, ked=\EJ, kel=\Et, kf0=\E?p,
-       kf1=\E?q, kf2=\E?r, kf3=\E?s, kf4=\E?t, kf5=\E?u, kf6=\E?v,
-       kf7=\E?w, kf8=\E?x, kf9=\E?y, khome=\EH, khts=\E1, kich1=\Ei,
-       kil1=\EL, krmir=\Ej, mc0=\EH\E], mc4=\EX, mc5=\EW, ri=\EI,
-       rmacs=\EG, rmkx=\E>, rmso=\E3,
-       rs1=\E3\Eb\Ej\E\El\EG\Ec\Ek\EX, sgr0=\E3\Eb, smacs=\EF,
-       smkx=\E=, smso=\E4, tbc=\Eg,
+       acsc=+h.kffggjmkllsmenbq`tnuovcwdxa}r, bel=^G, cbt=\Ez,
+       clear=\Ev, cnorm=\Ec, cr=\r, cub1=^H, cud1=\n, cuf1=\EC,
+       cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\Ed,
+       dch1=\EO, dim=\E4, dl1=\EM, ed=\Ey, el=\Ex, home=\EH, ht=^I,
+       hts=\E1, il1=\EL, ind=\n, invis=\Ea, kbs=^H, kclr=\Ev,
+       kctab=\E2, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
+       kdch1=\EO, kdl1=\EM, ked=\EJ, kel=\Et, kf0=\E?p, kf1=\E?q,
+       kf2=\E?r, kf3=\E?s, kf4=\E?t, kf5=\E?u, kf6=\E?v, kf7=\E?w,
+       kf8=\E?x, kf9=\E?y, khome=\EH, khts=\E1, kich1=\Ei, kil1=\EL,
+       krmir=\Ej, mc0=\EH\E], mc4=\EX, mc5=\EW, ri=\EI, rmacs=\EG,
+       rmkx=\E>, rmso=\E3, rs1=\E3\Eb\Ej\E\El\EG\Ec\Ek\EX,
+       sgr0=\E3\Eb, smacs=\EF, smkx=\E=, smso=\E4, tbc=\Eg,

 # The older Visuals didn't come with function keys. This entry uses
 # <smkx> and <rmkx> so that the keypad keys can be used as function keys.
 # If your version of vi doesn't support function keys you may want
 # The older Visuals didn't come with function keys. This entry uses
 # <smkx> and <rmkx> so that the keypad keys can be used as function keys.
 # If your version of vi doesn't support function keys you may want


@@ -25744,4 +25744,8 @@ v3220|LANPAR Vision II model 3220/3221/3222,
 #        (report by C Anthony Risinger)
 #      + improve iterm2 using some xterm features which it has adapted -TD
 #
 #        (report by C Anthony Risinger)
 #      + improve iterm2 using some xterm features which it has adapted -TD
 #

+# 2018-06-30
+#      + add acsc string to vi200 (Nibby Nebbulous)
+#        add right/down-arrow to vi200's acsc -TD
+#

 ######## SHANTIH!  SHANTIH!  SHANTIH!
 ######## SHANTIH!  SHANTIH!  SHANTIH!

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index fa523e579d878198f6a922d73f6a2d64c5e50887..24a114ad7248fd895f47f3e9e7ae5f8731993997 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*

- * $Id: curses.priv.h,v 1.602 2018/06/23 21:35:06 tom Exp $
+ * $Id: curses.priv.h,v 1.603 2018/06/30 21:46:25 tom Exp $

  *
  *     curses.priv.h
  *
  *
  *     curses.priv.h
  *


@@ -71,7 +71,7 @@ extern "C" {
 #include <unistd.h>
 #endif
 
 #include <unistd.h>
 #endif
 

-#if HAVE_SYS_BSDTYPES_H
+#if HAVE_SYS_BSDTYPES_H) && !(defined(_WIN32) || defined(_WIN64))

 #include <sys/bsdtypes.h>      /* needed for ISC */
 #endif
 
 #include <sys/bsdtypes.h>      /* needed for ISC */
 #endif
 

diff --git a/ncurses/tinfo/getenv_num.c b/ncurses/tinfo/getenv_num.c
index d5e35cb46638d9236e01024beb7eba2b8c302391..d3d257221cd78576b3cb94f0259c0585b70ae5db 100644 (file)
--- a/ncurses/tinfo/getenv_num.c
+++ b/ncurses/tinfo/getenv_num.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2018 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            *


@@ -36,7 +36,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: getenv_num.c,v 1.6 2013/09/28 20:25:08 tom Exp $")
+MODULE_ID("$Id: getenv_num.c,v 1.7 2018/06/30 19:54:49 tom Exp $")

 
 NCURSES_EXPORT(int)
 _nc_getenv_num(const char *name)
 
 NCURSES_EXPORT(int)
 _nc_getenv_num(const char *name)


@@ -68,6 +68,8 @@ _nc_setenv_num(const char *name, int value)
        _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "%s=%d", name, value);
        if ((s = strdup(buffer)) != 0)
            putenv(s);
        _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "%s=%d", name, value);
        if ((s = strdup(buffer)) != 0)
            putenv(s);

+#else
+#error expected setenv/putenv functions

 #endif
     }
 }
 #endif
     }
 }

diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index b7937da2291ccd2c2583e9f6e540337fc14b4fca..286a3c66559399196c2b68d21c587991990a54de 100644 (file)
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -48,7 +48,7 @@
 #include <locale.h>
 #endif
 
 #include <locale.h>
 #endif
 

-MODULE_ID("$Id: lib_setup.c,v 1.193 2018/06/23 21:35:06 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.194 2018/06/30 19:40:27 tom Exp $")

 
 /****************************************************************************
  *
 
 /****************************************************************************
  *


@@ -543,9 +543,9 @@ _nc_get_locale(void)
      */
     env = setlocale(LC_CTYPE, 0);
 #else
      */
     env = setlocale(LC_CTYPE, 0);
 #else

-    if (((env = getenv("LC_ALL")) != 0 && *env != '\0')
+    if (((env = getenv("LANG")) != 0 && *env != '\0')

        || ((env = getenv("LC_CTYPE")) != 0 && *env != '\0')
        || ((env = getenv("LC_CTYPE")) != 0 && *env != '\0')

-       || ((env = getenv("LANG")) != 0 && *env != '\0')) {
+       || ((env = getenv("LC_ALL")) != 0 && *env != '\0')) {

        ;
     }
 #endif
        ;
     }
 #endif

diff --git a/ncurses/widechar/charable.c b/ncurses/widechar/charable.c
index 91ceb32ff738407ff0bcaf9f1bdd725ede354b7f..104f59dd8560e37bf2eecc798d83ed4a5a8ded57 100644 (file)
--- a/ncurses/widechar/charable.c
+++ b/ncurses/widechar/charable.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 2003-2005,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 2003-2008,2018 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,7 +32,7 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: charable.c,v 1.5 2008/07/05 20:51:41 tom Exp $")
+MODULE_ID("$Id: charable.c,v 1.7 2018/06/30 20:46:25 tom Exp $")

 
 NCURSES_EXPORT(bool) _nc_is_charable(wchar_t ch)
 {
 
 NCURSES_EXPORT(bool) _nc_is_charable(wchar_t ch)
 {


@@ -57,6 +57,8 @@ NCURSES_EXPORT(int) _nc_to_char(wint_t ch)
        result = UChar(temp[0]);
     else
        result = -1;
        result = UChar(temp[0]);
     else
        result = -1;

+#else
+#error expected either wctob/wctomb

 #endif
     return result;
 }
 #endif
     return result;
 }


@@ -75,6 +77,8 @@ NCURSES_EXPORT(wint_t) _nc_to_widechar(int ch)
        result = convert;
     else
        result = WEOF;
        result = convert;
     else
        result = WEOF;

+#else
+#error expected either btowc/mbtowc

 #endif
     return result;
 }
 #endif
     return result;
 }

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 9b1ae28af8a3a3f3ef49d476307529e4d2f87777..57003c0b02fafe9a282585869c953f5ec1c5b843 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20180623) unstable; urgency=low
+ncurses6 (6.1+20180630) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 18 Jun 2018 16:36:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 30 Jun 2018 11:17:22 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 9b1ae28af8a3a3f3ef49d476307529e4d2f87777..57003c0b02fafe9a282585869c953f5ec1c5b843 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20180623) unstable; urgency=low
+ncurses6 (6.1+20180630) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 18 Jun 2018 16:36:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 30 Jun 2018 11:17:22 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index 02564b74a545f59ed64ea93e037925ad0875ee71..a61167255ef527b15d9bbb510797fdbaf7c41b2a 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20180623) unstable; urgency=low
+ncurses6 (6.1+20180630) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 18 Jun 2018 16:36:58 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 30 Jun 2018 11:17:22 -0400

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index e279b10fbe712444a56b73822a3ab7564adbb014..ac9bb305ece3aa55e9da3aeb5e428f95c92e4204 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.276 2018/06/18 20:36:58 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.277 2018/06/30 15:17:22 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2018"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2018"\r

-!define VERSION_MMDD  "0623"\r
+!define VERSION_MMDD  "0630"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index c5e6fda369c2e69768800215996c0963bbf0f160..a20caedf59cfbaef641443586b8e7a3dd9c418ed 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.1
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.1

-Release: 20180623
+Release: 20180630

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index f2c782204f87243b0a5e0aa64e3951dca449f81c..552ba9e6c83c7b34ff132a29a2cee702b6922025 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1

-Release: 20180623
+Release: 20180630

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/progs/tput.c b/progs/tput.c
index fd051eb40571935edeedc4af7b92d759a1b0538d..88e757994fa123a0e4d241b05509e1bca0f13947 100644 (file)
--- a/progs/tput.c
+++ b/progs/tput.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2017,2018 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            *


@@ -50,7 +50,7 @@
 #include <transform.h>
 #include <tty_settings.h>
 
 #include <transform.h>
 #include <tty_settings.h>
 

-MODULE_ID("$Id: tput.c,v 1.78 2017/10/14 20:46:43 tom Exp $")
+MODULE_ID("$Id: tput.c,v 1.79 2018/06/30 15:56:01 Nicholas.Marriott Exp $")

 
 #define PUTS(s)                fputs(s, stdout)
 
 
 #define PUTS(s)                fputs(s, stdout)
 


@@ -293,7 +293,7 @@ main(int argc, char **argv)
 
     term = getenv("TERM");
 
 
     term = getenv("TERM");
 

-    while ((c = getopt(argc, argv, "ST:V")) != -1) {
+    while ((c = getopt(argc, argv, "ST:Vx")) != -1) {

        switch (c) {
        case 'S':
            cmdline = FALSE;
        switch (c) {
        case 'S':
            cmdline = FALSE;