Module Name: src
Committed By: roy
Date: Tue Oct 4 11:01:14 UTC 2011
Modified Files:
src/lib/libcurses: Makefile curses.3 curses.h curses_private.h
curses_termcap.3 setterm.c
src/lib/libterminfo: Makefile curterm.c term.h terminfo.3
Removed Files:
src/lib/libcurses: longname.c
Log Message:
Move longname(3) from curses to terminfo, pre-cursor to fix PR/43386.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/lib/libcurses/Makefile
cvs rdiff -u -r1.61 -r1.62 src/lib/libcurses/curses.3
cvs rdiff -u -r1.102 -r1.103 src/lib/libcurses/curses.h
cvs rdiff -u -r1.46 -r1.47 src/lib/libcurses/curses_private.h
cvs rdiff -u -r1.4 -r1.5 src/lib/libcurses/curses_termcap.3
cvs rdiff -u -r1.16 -r0 src/lib/libcurses/longname.c
cvs rdiff -u -r1.47 -r1.48 src/lib/libcurses/setterm.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libterminfo/Makefile
cvs rdiff -u -r1.6 -r1.7 src/lib/libterminfo/curterm.c
cvs rdiff -u -r1.9 -r1.10 src/lib/libterminfo/term.h
cvs rdiff -u -r1.7 -r1.8 src/lib/libterminfo/terminfo.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/Makefile
diff -u src/lib/libcurses/Makefile:1.65 src/lib/libcurses/Makefile:1.66
--- src/lib/libcurses/Makefile:1.65 Mon Apr 4 10:32:04 2011
+++ src/lib/libcurses/Makefile Tue Oct 4 11:01:13 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2011/04/04 10:32:04 blymn Exp $
+# $NetBSD: Makefile,v 1.66 2011/10/04 11:01:13 roy Exp $
# @(#)Makefile 8.2 (Berkeley) 1/2/94
.include <bsd.own.mk>
@@ -102,7 +102,7 @@ MLINKS+= curses_addch.3 addch.3 curses_a
curses_touch.3 is_wintouched.3 curses_screen.3 isendwin.3 \
curses_keyname.3 keyname.3 \
curses_input.3 keypad.3 curses_tty.3 killchar.3 \
- curses_refresh.3 leaveok.3 curses_termcap.3 longname.3 \
+ curses_refresh.3 leaveok.3 \
curses_tty.3 meta.3 curses_cursor.3 move.3 \
curses_addch.3 mvaddch.3 curses_addchstr.3 mvaddchnstr.3 \
curses_addchstr.3 mvaddchstr.3 curses_addstr.3 mvaddnstr.3 \
Index: src/lib/libcurses/curses.3
diff -u src/lib/libcurses/curses.3:1.61 src/lib/libcurses/curses.3:1.62
--- src/lib/libcurses/curses.3:1.61 Thu Dec 9 13:26:27 2010
+++ src/lib/libcurses/curses.3 Tue Oct 4 11:01:13 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: curses.3,v 1.61 2010/12/09 13:26:27 njoly Exp $
+.\" $NetBSD: curses.3,v 1.62 2011/10/04 11:01:13 roy Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)curses.3 8.1 (Berkeley) 6/4/93
.\"
-.Dd July 6, 2009
+.Dd October 4, 2011
.Dt CURSES 3
.Os
.Sh NAME
@@ -158,7 +158,6 @@ must be called before any of the other r
.It keypad Ta Xr curses_input 3
.It killchar Ta Xr curses_tty 3
.It leaveok Ta Xr curses_tty 3
-.It longname Ta Xr curses_termcap 3
.It meta Ta Xr curses_tty 3
.It move Ta Xr curses_cursor 3
.It mvaddch Ta Xr curses_addch 3
Index: src/lib/libcurses/curses.h
diff -u src/lib/libcurses/curses.h:1.102 src/lib/libcurses/curses.h:1.103
--- src/lib/libcurses/curses.h:1.102 Sun Jul 17 20:54:34 2011
+++ src/lib/libcurses/curses.h Tue Oct 4 11:01:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: curses.h,v 1.102 2011/07/17 20:54:34 joerg Exp $ */
+/* $NetBSD: curses.h,v 1.103 2011/10/04 11:01:13 roy Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -672,7 +672,6 @@ int keypad(WINDOW *, bool);
char *keyname(int);
char killchar(void);
int leaveok(WINDOW *, bool);
-char *longname(void);
int meta(WINDOW *, bool);
int mvcur(int, int, int, int);
int mvderwin(WINDOW *, int, int);
Index: src/lib/libcurses/curses_private.h
diff -u src/lib/libcurses/curses_private.h:1.46 src/lib/libcurses/curses_private.h:1.47
--- src/lib/libcurses/curses_private.h:1.46 Thu Dec 16 17:42:28 2010
+++ src/lib/libcurses/curses_private.h Tue Oct 4 11:01:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: curses_private.h,v 1.46 2010/12/16 17:42:28 wiz Exp $ */
+/* $NetBSD: curses_private.h,v 1.47 2011/10/04 11:01:13 roy Exp $ */
/*-
* Copyright (c) 1998-2000 Brett Lymn
@@ -239,7 +239,6 @@ struct __screen {
unsigned int len;
int meta_state;
char padchar;
- char ttytype[128];
int endwin;
int notty;
int half_delay;
@@ -314,7 +313,6 @@ void __cursesi_putnsp(nschar_t *, const
void __cursesi_chtype_to_cchar(chtype, cchar_t *);
#endif /* HAVE_WCHAR */
int __unget(wint_t);
-char *__longname(char *, char *); /* Original BSD version */
int __mvcur(int, int, int, int, int);
WINDOW *__newwin(SCREEN *, int, int, int, int, int);
int __nodelay(void);
Index: src/lib/libcurses/curses_termcap.3
diff -u src/lib/libcurses/curses_termcap.3:1.4 src/lib/libcurses/curses_termcap.3:1.5
--- src/lib/libcurses/curses_termcap.3:1.4 Wed Apr 16 13:35:01 2003
+++ src/lib/libcurses/curses_termcap.3 Tue Oct 4 11:01:14 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: curses_termcap.3,v 1.4 2003/04/16 13:35:01 wiz Exp $
+.\" $NetBSD: curses_termcap.3,v 1.5 2011/10/04 11:01:14 roy Exp $
.\"
.\" Copyright (c) 2002
.\" Brett Lymn ([email protected], [email protected])
@@ -30,14 +30,13 @@
.\" SUCH DAMAGE.
.\"
.\"
-.Dd August 12, 2002
+.Dd October 4, 2011
.Dt CURSES_TERMCAP 3
.Os
.Sh NAME
.Nm curses_termcap ,
.Nm fullname ,
-.Nm getcap ,
-.Nm longname
+.Nm getcap
.Nd curses termcap querying routines
.Sh LIBRARY
.Lb libcurses
@@ -47,8 +46,6 @@
.Fn fullname "char *termbuf" "char *name"
.Ft char *
.Fn getcap "char *name"
-.Ft char *
-.Fn longname "void"
.Sh DESCRIPTION
The
.Fn fullname
@@ -68,16 +65,6 @@ A termcap entry can be retrieved by call
function with the name of the capability in
.Fa name .
The matching capability string for the terminal is returned.
-.Pp
-The
-.Fn longname
-function returns a verbose description of the terminal which is taken
-from the last name alias in the termcap description for the terminal.
-This string will be at most 128 characters long and will only be
-defined after a call to
-.Fn initscr
-or
-.Fn newterm .
.Sh RETURN VALUES
Functions returning pointers will return
.Dv NULL
Index: src/lib/libcurses/setterm.c
diff -u src/lib/libcurses/setterm.c:1.47 src/lib/libcurses/setterm.c:1.48
--- src/lib/libcurses/setterm.c:1.47 Thu Feb 11 11:45:47 2010
+++ src/lib/libcurses/setterm.c Tue Oct 4 11:01:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: setterm.c,v 1.47 2010/02/11 11:45:47 roy Exp $ */
+/* $NetBSD: setterm.c,v 1.48 2011/10/04 11:01:14 roy Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)setterm.c 8.8 (Berkeley) 10/25/94";
#else
-__RCSID("$NetBSD: setterm.c,v 1.47 2010/02/11 11:45:47 roy Exp $");
+__RCSID("$NetBSD: setterm.c,v 1.48 2011/10/04 11:01:14 roy Exp $");
#endif
#endif /* not lint */
@@ -127,17 +127,6 @@ _cursesi_setterm(char *type, SCREEN *scr
screen->padchar = t_pad_char(screen->term) ?
t_pad_char(screen->term)[0] : 0;
- /* Get full name of terminal */
- if (unknown) {
- strcpy(screen->ttytype, "dumb");
- return ERR;
- }
- if (screen->term->desc == NULL)
- screen->ttytype[0] = '\0';
- else
- strlcpy(screen->ttytype, screen->term->desc,
- sizeof(screen->ttytype));
-
/* If no scrolling commands, no quick change. */
screen->noqch =
(t_change_scroll_region(screen->term) == NULL ||
Index: src/lib/libterminfo/Makefile
diff -u src/lib/libterminfo/Makefile:1.16 src/lib/libterminfo/Makefile:1.17
--- src/lib/libterminfo/Makefile:1.16 Mon Oct 3 13:10:58 2011
+++ src/lib/libterminfo/Makefile Tue Oct 4 11:01:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2011/10/03 13:10:58 roy Exp $
+# $NetBSD: Makefile,v 1.17 2011/10/04 11:01:14 roy Exp $
USE_SHLIBDIR= yes
@@ -15,7 +15,7 @@ INCSDIR= /usr/include
MAN= terminfo.3 terminfo.5
MLINKS= terminfo.3 setupterm.3 \
terminfo.3 set_curterm.3 terminfo.3 del_curterm.3 \
- terminfo.3 termname.3 \
+ terminfo.3 termname.3 terminfo.3 longname.3 \
terminfo.3 tigetnum.3 terminfo.3 tigetflag.3 \
terminfo.3 tigetstr.3 terminfo.3 tparm.3 terminfo.3 tputs.3 \
terminfo.3 putp.3 \
Index: src/lib/libterminfo/curterm.c
diff -u src/lib/libterminfo/curterm.c:1.6 src/lib/libterminfo/curterm.c:1.7
--- src/lib/libterminfo/curterm.c:1.6 Mon Oct 3 19:18:55 2011
+++ src/lib/libterminfo/curterm.c Tue Oct 4 11:01:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: curterm.c,v 1.6 2011/10/03 19:18:55 roy Exp $ */
+/* $NetBSD: curterm.c,v 1.7 2011/10/04 11:01:14 roy Exp $ */
/*
* Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: curterm.c,v 1.6 2011/10/03 19:18:55 roy Exp $");
+__RCSID("$NetBSD: curterm.c,v 1.7 2011/10/04 11:01:14 roy Exp $");
#include <assert.h>
#include <stdlib.h>
@@ -108,3 +108,15 @@ termname(void)
_DIAGASSERT(cur_term != NULL);
return __UNCONST(cur_term->name);
}
+
+static const char * nullname = '\0';
+
+char *
+longname(void)
+{
+
+ _DIAGASSERT(cur_term != NULL);
+ if (cur_term->desc == NULL)
+ return __UNCONST(nullname);
+ return __UNCONST(cur_term->desc);
+}
Index: src/lib/libterminfo/term.h
diff -u src/lib/libterminfo/term.h:1.9 src/lib/libterminfo/term.h:1.10
--- src/lib/libterminfo/term.h:1.9 Mon Oct 3 12:31:51 2011
+++ src/lib/libterminfo/term.h Tue Oct 4 11:01:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: term.h,v 1.9 2011/10/03 12:31:51 roy Exp $ */
+/* $NetBSD: term.h,v 1.10 2011/10/04 11:01:14 roy Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 The NetBSD Foundation, Inc.
@@ -1469,6 +1469,7 @@ int setupterm(const char *, int, int *)
TERMINAL * set_curterm(TERMINAL *);
int del_curterm(TERMINAL *);
char * termname(void);
+char * longname(void);
/* information functions */
int tigetflag(const char *);
Index: src/lib/libterminfo/terminfo.3
diff -u src/lib/libterminfo/terminfo.3:1.7 src/lib/libterminfo/terminfo.3:1.8
--- src/lib/libterminfo/terminfo.3:1.7 Mon Oct 3 19:15:03 2011
+++ src/lib/libterminfo/terminfo.3 Tue Oct 4 11:01:14 2011
@@ -1,4 +1,4 @@
-.\" $NetBSD: terminfo.3,v 1.7 2011/10/03 19:15:03 roy Exp $
+.\" $NetBSD: terminfo.3,v 1.8 2011/10/04 11:01:14 roy Exp $
.\"
.\" Copyright (c) 2009, 2011 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 3, 2011
+.Dd October 4, 2011
.Dt TERMINFO 3
.Os
.Sh NAME
@@ -35,6 +35,7 @@
.Nm set_curterm ,
.Nm del_curterm ,
.Nm termname ,
+.Nm longname ,
.Nm tigetflag ,
.Nm tigetnum ,
.Nm tigetstr ,
@@ -57,6 +58,8 @@
.Fn del_curterm "TERMINAL *oterm"
.Ft char *
.Fn termname "void"
+.Ft char *
+.Fn longname "void"
.Ft int
.Fn tigetnum "const char *id"
.Ft int
@@ -148,6 +151,10 @@ The
.Fn termname
function returns the name of
.Va cur_term .
+The
+.Fn longname
+function returns the description of
+.Va cur_term .
.Pp
The
.Fn tigetflag
