summaryrefslogtreecommitdiffstats
path: root/contrib/ncurses
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/ncurses')
-rw-r--r--contrib/ncurses/ncurses/tinfo/comp_scan.c44
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_raw.c10
-rw-r--r--contrib/ncurses/ncurses/tinfo/lib_termcap.c186
3 files changed, 65 insertions, 175 deletions
diff --git a/contrib/ncurses/ncurses/tinfo/comp_scan.c b/contrib/ncurses/ncurses/tinfo/comp_scan.c
index 52fb13a..6465ed7 100644
--- a/contrib/ncurses/ncurses/tinfo/comp_scan.c
+++ b/contrib/ncurses/ncurses/tinfo/comp_scan.c
@@ -31,6 +31,8 @@
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
****************************************************************************/
+/* $FreeBSD$ */
+
/*
* comp_scan.c --- Lexical scanner for terminfo compiler.
*
@@ -50,7 +52,7 @@
#include <term_entry.h>
#include <tic.h>
-MODULE_ID("$Id: comp_scan.c,v 1.59 2001/09/23 00:56:29 tom Exp $")
+MODULE_ID("$Id: comp_scan.c,v 1.56 2001/04/21 18:53:34 tom Exp $")
/*
* Maximum length of string capability we'll accept before raising an error.
@@ -86,7 +88,7 @@ _nc_curr_token =
static bool first_column; /* See 'next_char()' below */
static char separator; /* capability separator */
static int pushtype; /* type of pushback token */
-static char *pushname;
+static char pushname[MAX_NAME_SIZE + 1];
#if NCURSES_EXT_FUNCS
NCURSES_EXPORT_VAR(bool)
@@ -146,28 +148,26 @@ NCURSES_EXPORT(int)
_nc_get_token(bool silent)
{
static const char terminfo_punct[] = "@%&*!#";
- static char *buffer;
-
+ long number;
+ int type;
+ int ch;
char *numchk;
- char *ptr;
char numbuf[80];
- int ch;
+ unsigned found;
+ static char buffer[MAX_ENTRY_SIZE];
+ char *ptr;
int dot_flag = FALSE;
- int type;
- long number;
long token_start;
- unsigned found;
if (pushtype != NO_PUSHBACK) {
int retval = pushtype;
- _nc_set_type(pushname != 0 ? pushname : "");
+ _nc_set_type(pushname);
DEBUG(3, ("pushed-back token: `%s', class %d",
_nc_curr_token.tk_name, pushtype));
pushtype = NO_PUSHBACK;
- if (pushname != 0)
- pushname[0] = '\0';
+ pushname[0] = '\0';
/* currtok wasn't altered by _nc_push_token() */
return (retval);
@@ -220,9 +220,6 @@ _nc_get_token(bool silent)
goto start_token;
}
- if (buffer == 0)
- buffer = _nc_doalloc(buffer, MAX_ENTRY_SIZE);
-
ptr = buffer;
*(ptr++) = ch;
@@ -295,8 +292,10 @@ _nc_get_token(bool silent)
if (!silent && desc) {
if (*desc == '\0')
_nc_warning("empty longname field");
+#ifndef FREEBSD_NATIVE
else if (strchr(desc, ' ') == (char *) NULL)
_nc_warning("older tic versions may treat the description field as an alias");
+#endif
}
if (!desc)
desc = buffer + strlen(buffer);
@@ -307,7 +306,7 @@ _nc_get_token(bool silent)
* special characters can be dangerous due to shell expansion.
*/
for (ptr = buffer; ptr < desc; ptr++) {
- if (isspace(UChar(*ptr))) {
+ if (isspace(CharOf(*ptr))) {
if (!silent)
_nc_warning("whitespace in name or alias field");
break;
@@ -378,7 +377,7 @@ _nc_get_token(bool silent)
break;
case '=':
- ch = _nc_trans_string(ptr, buffer + MAX_ENTRY_SIZE);
+ ch = _nc_trans_string(ptr, buffer + sizeof(buffer));
if (!silent && ch != separator)
_nc_warning("Missing separator");
_nc_curr_token.tk_name = buffer;
@@ -634,12 +633,10 @@ _nc_push_token(int tokclass)
/*
* This implementation is kind of bogus, it will fail if we ever do more
* than one pushback at a time between get_token() calls. It relies on the
- * fact that _nc_curr_token is static storage that nothing but
- * _nc_get_token() touches.
+ * fact that curr_tok is static storage that nothing but get_token()
+ * touches.
*/
pushtype = tokclass;
- if (pushname == 0)
- pushname = _nc_doalloc(pushname, MAX_NAME_SIZE + 1);
_nc_get_type(pushname);
DEBUG(3, ("pushing token: `%s', class %d",
@@ -687,8 +684,7 @@ NCURSES_EXPORT(void)
_nc_reset_input(FILE * fp, char *buf)
{
pushtype = NO_PUSHBACK;
- if (pushname != 0)
- pushname[0] = '\0';
+ pushname[0] = '\0';
yyin = fp;
bufstart = bufptr = buf;
_nc_curr_file_pos = 0L;
@@ -707,7 +703,7 @@ last_char(void)
{
size_t len = strlen(bufptr);
while (len--) {
- if (!isspace(UChar(bufptr[len])))
+ if (!isspace(CharOf(bufptr[len])))
return bufptr[len];
}
return 0;
diff --git a/contrib/ncurses/ncurses/tinfo/lib_raw.c b/contrib/ncurses/ncurses/tinfo/lib_raw.c
index 97cf0cb..17474e1 100644
--- a/contrib/ncurses/ncurses/tinfo/lib_raw.c
+++ b/contrib/ncurses/ncurses/tinfo/lib_raw.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,1999,2000 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 *
@@ -31,6 +31,8 @@
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
****************************************************************************/
+/* $FreeBSD$ */
+
/*
* raw.c
*
@@ -48,7 +50,7 @@
#include <curses.priv.h>
#include <term.h> /* cur_term */
-MODULE_ID("$Id: lib_raw.c,v 1.12 2001/08/04 17:18:38 tom Exp $")
+MODULE_ID("$Id: lib_raw.c,v 1.10 2000/12/10 02:55:07 tom Exp $")
#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
#define _POSIX_SOURCE
@@ -140,8 +142,8 @@ qiflush(void)
cur_term->Nttyb.c_lflag &= ~(NOFLSH);
AFTER("qiflush");
(void) _nc_set_tty_mode(&cur_term->Nttyb);
-#endif
returnVoid;
+#endif
}
NCURSES_EXPORT(int)
@@ -205,8 +207,8 @@ noqiflush(void)
cur_term->Nttyb.c_lflag |= NOFLSH;
AFTER("noqiflush");
(void) _nc_set_tty_mode(&cur_term->Nttyb);
-#endif
returnVoid;
+#endif
}
NCURSES_EXPORT(int)
diff --git a/contrib/ncurses/ncurses/tinfo/lib_termcap.c b/contrib/ncurses/ncurses/tinfo/lib_termcap.c
index c647b97..be91e06 100644
--- a/contrib/ncurses/ncurses/tinfo/lib_termcap.c
+++ b/contrib/ncurses/ncurses/tinfo/lib_termcap.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. *
+ * Copyright (c) 1998,1999,2000 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 *
@@ -29,80 +29,35 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
- * *
- * some of the code in here was contributed by: *
- * Magnus Bengtsson, d6mbeng@dtek.chalmers.se (Nov'93) *
****************************************************************************/
+/* $FreeBSD$ */
+
#include <curses.priv.h>
#include <termcap.h>
#include <tic.h>
-#include <ctype.h>
#define __INTERNAL_CAPS_VISIBLE
#include <term_entry.h>
-MODULE_ID("$Id: lib_termcap.c,v 1.42 2001/09/22 19:17:31 tom Exp $")
-
-#define CSI 233
-#define ESC 033 /* ^[ */
-#define L_BRACK '['
-#define SHIFT_OUT 017 /* ^N */
-
-NCURSES_EXPORT_VAR(char *) UP = 0;
-NCURSES_EXPORT_VAR(char *) BC = 0;
+MODULE_ID("$Id: lib_termcap.c,v 1.39 2000/12/10 02:56:30 tom Exp $")
-static char *fix_me = 0;
+/*
+ some of the code in here was contributed by:
+ Magnus Bengtsson, d6mbeng@dtek.chalmers.se
+*/
-static char *
-set_attribute_9(int flag)
-{
- const char *result;
-
- if ((result = tparm(set_attributes, 0, 0, 0, 0, 0, 0, 0, 0, flag)) == 0)
- result = "";
- return strdup(result);
-}
+NCURSES_EXPORT_VAR(char *)
+UP = 0;
+NCURSES_EXPORT_VAR(char *)
+BC = 0;
-static int
-is_csi(char *s)
-{
- if (UChar(s[0]) == CSI)
- return 1;
- else if (s[0] == ESC && s[1] == L_BRACK)
- return 2;
- return 0;
-}
-
-static char *
-skip_zero(char *s)
-{
- if (s[0] == '0') {
- if (s[1] == ';')
- s += 2;
- else if (isalpha(UChar(s[1])))
- s += 1;
- }
- return s;
-}
-
-static bool
-similar_sgr(char *a, char *b)
-{
- int csi_a = is_csi(a);
- int csi_b = is_csi(b);
-
- if (csi_a != 0 && csi_b != 0 && csi_a == csi_b) {
- a += csi_a;
- b += csi_b;
- if (*a != *b) {
- a = skip_zero(a);
- b = skip_zero(b);
- }
- }
- return strcmp(a, b) == 0;
-}
+#ifdef FREEBSD_NATIVE
+#undef GCC_UNUSED
+#define GCC_UNUSED
+extern char _nc_termcap[]; /* buffer to copy out */
+#endif
/***************************************************************************
*
@@ -120,7 +75,8 @@ similar_sgr(char *a, char *b)
***************************************************************************/
NCURSES_EXPORT(int)
-tgetent(char *bufp GCC_UNUSED, const char *name)
+tgetent
+(char *bufp GCC_UNUSED, const char *name)
{
int errcode;
@@ -128,11 +84,6 @@ tgetent(char *bufp GCC_UNUSED, const char *name)
setupterm((NCURSES_CONST char *) name, STDOUT_FILENO, &errcode);
- PC = 0;
- UP = 0;
- BC = 0;
- fix_me = 0;
-
if (errcode == 1) {
if (cursor_left)
@@ -147,68 +98,6 @@ tgetent(char *bufp GCC_UNUSED, const char *name)
if (backspace_if_not_bs != NULL)
BC = backspace_if_not_bs;
- /*
- * While 'sgr0' is the "same" as termcap 'me', there is a compatibility
- * issue. The sgr/sgr0 capabilities include setting/clearing alternate
- * character set mode. A termcap application cannot use sgr, so sgr0
- * strings that reset alternate character set mode will be
- * misinterpreted. Here, we remove those from the more common
- * ISO/ANSI/VT100 entries, which have sgr0 agreeing with sgr.
- */
- if (exit_attribute_mode != 0
- && set_attributes != 0) {
- char *on = set_attribute_9(1);
- char *off = set_attribute_9(0);
- char *tmp;
- size_t i, j, k;
-
- if (similar_sgr(off, exit_attribute_mode)
- && !similar_sgr(off, on)) {
- TR(TRACE_DATABASE, ("adjusting sgr0 : %s", _nc_visbuf(off)));
- FreeIfNeeded(fix_me);
- fix_me = off;
- for (i = 0; off[i] != '\0'; ++i) {
- if (on[i] != off[i]) {
- j = strlen(off);
- k = strlen(on);
- while (j != 0
- && k != 0
- && off[j - 1] == on[k - 1]) {
- --j, --k;
- }
- while (off[j] != '\0') {
- off[i++] = off[j++];
- }
- off[i] = '\0';
- break;
- }
- }
- /* SGR 10 would reset to normal font */
- if ((i = is_csi(off)) != 0
- && off[strlen(off) - 1] == 'm') {
- tmp = skip_zero(off + i);
- if (tmp[0] == '1'
- && skip_zero(tmp + 1) != tmp + 1) {
- i = tmp - off;
- if (off[i - 1] == ';')
- i--;
- j = skip_zero(tmp + 1) - off;
- while (off[j] != '\0') {
- off[i++] = off[j++];
- }
- off[i] = '\0';
- }
- }
- TR(TRACE_DATABASE, ("...adjusted me : %s", _nc_visbuf(fix_me)));
- if (!strcmp(fix_me, exit_attribute_mode)) {
- TR(TRACE_DATABASE, ("...same result, discard"));
- free(fix_me);
- fix_me = 0;
- }
- }
- free(on);
- }
-
(void) baudrate(); /* sets ospeed as a side-effect */
/* LINT_PREPRO
@@ -218,6 +107,16 @@ tgetent(char *bufp GCC_UNUSED, const char *name)
#endif*/
}
+
+#ifdef FREEBSD_NATIVE
+ /*
+ * This is a REALLY UGLY hack. Basically, if we originate with
+ * a termcap source, try and copy it out.
+ */
+ if (bufp && _nc_termcap[0])
+ strncpy(bufp, _nc_termcap, 1024);
+#endif
+
returnCode(errcode);
}
@@ -288,10 +187,10 @@ tgetnum(NCURSES_CONST char *id)
***************************************************************************/
NCURSES_EXPORT(char *)
-tgetstr(NCURSES_CONST char *id, char **area)
+tgetstr
+(NCURSES_CONST char *id, char **area)
{
int i;
- char *result = NULL;
T((T_CALLED("tgetstr(%s,%p)"), id, area));
if (cur_term != 0) {
@@ -299,24 +198,17 @@ tgetstr(NCURSES_CONST char *id, char **area)
for_each_string(i, tp) {
const char *capname = ExtStrname(tp, i, strcodes);
if (!strncmp(id, capname, 2)) {
- result = tp->Strings[i];
- TR(TRACE_DATABASE, ("found match : %s", _nc_visbuf(result)));
+ TR(TRACE_DATABASE, ("found match : %s", _nc_visbuf(tp->Strings[i])));
/* setupterm forces canceled strings to null */
- if (VALID_STRING(result)) {
- if (result == exit_attribute_mode
- && fix_me != 0) {
- result = fix_me;
- TR(TRACE_DATABASE, ("altered to : %s", _nc_visbuf(result)));
- }
- if (area != 0
- && *area != 0) {
- (void) strcpy(*area, result);
- *area += strlen(*area) + 1;
- }
+ if (area != 0
+ && *area != 0
+ && VALID_STRING(tp->Strings[i])) {
+ (void) strcpy(*area, tp->Strings[i]);
+ *area += strlen(*area) + 1;
}
- break;
+ returnPtr(tp->Strings[i]);
}
}
}
- returnPtr(result);
+ returnPtr(NULL);
}
OpenPOWER on IntegriCloud