[src/trunk]: src/lib/libterminfo Allow loading of a terminfo database in /res...

[roy <roy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4782d4c7bf79
branches:  trunk
changeset: 751470:4782d4c7bf79
user:      roy <roy%NetBSD.org@localhost>
date:      Fri Feb 05 09:42:21 2010 +0000

description:
Allow loading of a terminfo database in /rescue.

diffstat:

 lib/libterminfo/term.c        |   6 +++---
 lib/libterminfo/terminfo.5    |  10 +++++++---
 lib/libterminfo/terminfo.5.in |  10 +++++++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diffs (106 lines):

diff -r 2a079d6de4e8 -r 4782d4c7bf79 lib/libterminfo/term.c
--- a/lib/libterminfo/term.c    Fri Feb 05 08:58:47 2010 +0000
+++ b/lib/libterminfo/term.c    Fri Feb 05 09:42:21 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: term.c,v 1.1 2010/02/03 15:16:32 roy Exp $ */
+/* $NetBSD: term.c,v 1.2 2010/02/05 09:42:21 roy Exp $ */
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: term.c,v 1.1 2010/02/03 15:16:32 roy Exp $");
+__RCSID("$NetBSD: term.c,v 1.2 2010/02/05 09:42:21 roy Exp $");
 
 #include <sys/stat.h>
 
@@ -44,7 +44,7 @@
 #include <term_private.h>
 #include <term.h>
 
-#define TERMINFO_DIRS  "/usr/share/misc/terminfo:/etc/terminfo:"
+#define TERMINFO_DIRS "/usr/share/misc/terminfo:/etc/terminfo:/rescue/terminfo"
 
 static char database[PATH_MAX];
 static char pathbuf[PATH_MAX];
diff -r 2a079d6de4e8 -r 4782d4c7bf79 lib/libterminfo/terminfo.5
--- a/lib/libterminfo/terminfo.5        Fri Feb 05 08:58:47 2010 +0000
+++ b/lib/libterminfo/terminfo.5        Fri Feb 05 09:42:21 2010 +0000
@@ -1,7 +1,7 @@
 .\"DO NOT EDIT
 .\"Automatically generated from termcap.5.in
 .\"
-.\"    $NetBSD: terminfo.5,v 1.3 2010/02/04 09:45:30 roy Exp $
+.\"    $NetBSD: terminfo.5,v 1.4 2010/02/05 09:42:21 roy Exp $
 .\"
 .\" Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -30,7 +30,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd October 1, 2009
+.Dd February 5, 2009
 .Dt TERMINFO 5
 .Os
 .Sh NAME
@@ -668,7 +668,9 @@
 will first look for
 .Pa $HOME/.terminfo.db ,
 followed by
-.Pa /usr/share/misc/terminfo.db
+.Pa /usr/share/misc/terminfo.db ,
+followed by
+.Pa /rescue/terminfo.db
 and
 .Pa /etc/terminfo.db .
 .Sh FILES
@@ -677,6 +679,8 @@
 Database of terminal descriptions for personal use.
 .It Pa /etc/terminfo.db
 Database of terminal descriptions for use during boot or single user.
+.It Pa /rescue/terminfo.db
+Database of terminal descriptions for use when rescuing the system.
 .It Pa /usr/share/misc/terminfo
 File containing terminal descriptions.
 .It Pa /usr/share/misc/terminfo.db
diff -r 2a079d6de4e8 -r 4782d4c7bf79 lib/libterminfo/terminfo.5.in
--- a/lib/libterminfo/terminfo.5.in     Fri Feb 05 08:58:47 2010 +0000
+++ b/lib/libterminfo/terminfo.5.in     Fri Feb 05 09:42:21 2010 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: terminfo.5.in,v 1.5 2010/02/04 09:45:30 roy Exp $
+.\"    $NetBSD: terminfo.5.in,v 1.6 2010/02/05 09:42:21 roy Exp $
 .\"
 .\" Copyright (c) 2009 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 1, 2009
+.Dd February 5, 2009
 .Dt TERMINFO 5
 .Os
 .Sh NAME
@@ -204,7 +204,9 @@
 will first look for
 .Pa $HOME/.terminfo.db ,
 followed by
-.Pa /usr/share/misc/terminfo.db
+.Pa /usr/share/misc/terminfo.db ,
+followed by
+.Pa /rescue/terminfo.db
 and
 .Pa /etc/terminfo.db .
 .Sh FILES
@@ -213,6 +215,8 @@
 Database of terminal descriptions for personal use.
 .It Pa /etc/terminfo.db
 Database of terminal descriptions for use during boot or single user.
+.It Pa /rescue/terminfo.db
+Database of terminal descriptions for use when rescuing the system.
 .It Pa /usr/share/misc/terminfo
 File containing terminal descriptions.
 .It Pa /usr/share/misc/terminfo.db