[Midnightbsd-cvs] src: ncurses/tinfo: Make local changes to ncurses to get it work with
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Oct 5 11:34:49 EDT 2008
Log Message:
-----------
Make local changes to ncurses to get it work with MidnightBSD
Modified Files:
--------------
src/contrib/ncurses/ncurses/tinfo:
comp_scan.c (r1.1.1.3 -> r1.2)
lib_baudrate.c (r1.1.1.2 -> r1.2)
lib_termcap.c (r1.1.1.3 -> r1.2)
-------------- next part --------------
Index: lib_baudrate.c
===================================================================
RCS file: /home/cvs/src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L contrib/ncurses/ncurses/tinfo/lib_baudrate.c -L contrib/ncurses/ncurses/tinfo/lib_baudrate.c -u -r1.1.1.2 -r1.2
--- contrib/ncurses/ncurses/tinfo/lib_baudrate.c
+++ contrib/ncurses/ncurses/tinfo/lib_baudrate.c
@@ -46,7 +46,7 @@
* of the indices up to B115200 fit nicely in a 'short', allowing us to retain
* ospeed's type for compatibility.
*/
-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__NetBSD__) || defined(__OpenBSD__)
#undef B0
#undef B50
#undef B75
Index: lib_termcap.c
===================================================================
RCS file: /home/cvs/src/contrib/ncurses/ncurses/tinfo/lib_termcap.c,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -L contrib/ncurses/ncurses/tinfo/lib_termcap.c -L contrib/ncurses/ncurses/tinfo/lib_termcap.c -u -r1.1.1.3 -r1.2
--- contrib/ncurses/ncurses/tinfo/lib_termcap.c
+++ contrib/ncurses/ncurses/tinfo/lib_termcap.c
@@ -36,6 +36,8 @@
* (but it has changed a lot) *
****************************************************************************/
+/* $MidnightBSD$ */
+
#define __INTERNAL_CAPS_VISIBLE
#include <curses.priv.h>
@@ -50,6 +52,10 @@
NCURSES_EXPORT_VAR(char *) UP = 0;
NCURSES_EXPORT_VAR(char *) BC = 0;
+#ifdef FREEBSD_NATIVE
+extern char _nc_termcap[]; /* buffer to copy out */
+#endif
+
typedef struct {
long sequence;
char *fix_sgr0; /* this holds the filtered sgr0 string */
@@ -174,6 +180,16 @@
#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);
}
Index: comp_scan.c
===================================================================
RCS file: /home/cvs/src/contrib/ncurses/ncurses/tinfo/comp_scan.c,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -L contrib/ncurses/ncurses/tinfo/comp_scan.c -L contrib/ncurses/ncurses/tinfo/comp_scan.c -u -r1.1.1.3 -r1.2
--- contrib/ncurses/ncurses/tinfo/comp_scan.c
+++ contrib/ncurses/ncurses/tinfo/comp_scan.c
@@ -32,6 +32,8 @@
* and: Thomas E. Dickey 1996 on *
****************************************************************************/
+/* $MidnightBSD$ */
+
/*
* comp_scan.c --- Lexical scanner for terminfo compiler.
*
@@ -513,8 +515,10 @@
if (!silent) {
if (*after_list == '\0')
_nc_warning("empty longname field");
+#ifndef FREEBSD_NATIVE
else if (strchr(after_list, ' ') == 0)
_nc_warning("older tic versions may treat the description field as an alias");
+#endif
}
} else {
after_list = buffer + strlen(buffer);
More information about the Midnightbsd-cvs
mailing list