ncurses 4.2

[ncurses.git] / ncurses / parse_entry.c

diff --git a/ncurses/parse_entry.c b/ncurses/parse_entry.c
index f3f74f79a797907218038f928b8d3186a54edd73..fd41019bf0b747e112b249500ea7a1ff6be132cd 100644 (file)
--- a/ncurses/parse_entry.c
+++ b/ncurses/parse_entry.c
@@ -1,22 +1,35 @@
-/***************************************************************************
-*                            COPYRIGHT NOTICE                              *
-****************************************************************************
-*                ncurses is copyright (C) 1992-1995                        *
-*                          Zeyd M. Ben-Halim                               *
-*                          zmbenhal@netcom.com                             *
-*                          Eric S. Raymond                                 *
-*                          esr@snark.thyrsus.com                           *
-*                                                                          *
-*        Permission is hereby granted to reproduce and distribute ncurses  *
-*        by any means and for any fee, whether alone or as part of a       *
-*        larger distribution, in source or in binary form, PROVIDED        *
-*        this notice is included with any such distribution, and is not    *
-*        removed from any of its header files. Mention of ncurses in any   *
-*        applications linked with it is highly appreciated.                *
-*                                                                          *
-*        ncurses comes AS IS with no warranty, implied or expressed.       *
-*                                                                          *
-***************************************************************************/
+/****************************************************************************
+ * Copyright (c) 1998 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            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
+
+/****************************************************************************
+ *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
+ *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ ****************************************************************************/
 
 
 /*
@@ -36,7 +49,7 @@
 #include <term.h>
 #include <term_entry.h>
 
-MODULE_ID("$Id: parse_entry.c,v 1.18 1997/02/02 01:50:15 tom Exp $")
+MODULE_ID("$Id: parse_entry.c,v 1.22 1998/02/11 12:13:59 tom Exp $")
 
 #ifdef LINT
 static short const parametrized[] = { 0 };
@@ -549,7 +562,7 @@ void postprocess_termcap(TERMTYPE *tp, bool has_base)
            } else
                tab = _nc_save_str(C_HT);
        }
-       if (init_tabs == -1 && has_hardware_tabs == TRUE)
+       if (init_tabs == ABSENT_NUMERIC && has_hardware_tabs == TRUE)
            init_tabs = 8;
 
        /*
@@ -563,7 +576,7 @@ void postprocess_termcap(TERMTYPE *tp, bool has_base)
      * Translate the old termcap :pt: capability to it#8 + ht=\t
      */
     if (has_hardware_tabs == TRUE)
-       if (init_tabs != 8)
+       if (init_tabs != 8 && init_tabs != ABSENT_NUMERIC)
            _nc_warning("hardware tabs with a width other than 8: %d", init_tabs);
         else
        {
@@ -700,6 +713,12 @@ void postprocess_termcap(TERMTYPE *tp, bool has_base)
     {
        char    buf2[MAX_TERMCAP_LENGTH], *bp = buf2;
 
+       if (acs_chars)
+       {
+           (void)strcpy(bp, acs_chars);
+           bp += strlen(bp);
+       }
+
        if (acs_ulcorner && acs_ulcorner[1] == '\0')
        {
            *bp++ = 'l';
@@ -781,6 +800,12 @@ void postprocess_terminfo(TERMTYPE *tp)
     {
        char    buf2[MAX_TERMCAP_LENGTH], *bp = buf2;
 
+       if (acs_chars)
+       {
+           (void)strcpy(bp, acs_chars);
+           bp += strlen(bp);
+       }
+
        if (box_chars_1[0])     /* ACS_ULCORNER */
        {
            *bp++ = 'l';
@@ -865,7 +890,7 @@ struct name_table_entry     const * lookup_fullname(const char *find)
 
     for (;;) {
        int count = 0;
-       char *const *names;
+       NCURSES_CONST char *const *names;
 
        switch (++state) {
        case BOOLEAN: