Module Name: src
Committed By: christos
Date: Fri Jun 17 16:59:51 UTC 2011
Modified Files:
src/tests/lib/libcurses: Makefile t_curses.sh
src/tests/lib/libcurses/director: director.c
Log Message:
Remove environment variable settings.
Now that we are not abusing $HOME to get to the terminfo db, make it visible.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libcurses/t_curses.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/lib/libcurses/director/director.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libcurses/Makefile
diff -u src/tests/lib/libcurses/Makefile:1.1 src/tests/lib/libcurses/Makefile:1.2
--- src/tests/lib/libcurses/Makefile:1.1 Sun Apr 10 05:55:08 2011
+++ src/tests/lib/libcurses/Makefile Fri Jun 17 12:59:51 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/10 09:55:08 blymn Exp $
+# $NetBSD: Makefile,v 1.2 2011/06/17 16:59:51 christos Exp $
NOMAN= # defined
@@ -9,7 +9,7 @@
TESTSDIR= ${TESTSBASE}/lib/libcurses
TEST_TERMINFO= atf.terminfo
-TERMINFO_DB= .terminfo
+TERMINFO_DB= terminfo
TERMINFODIR= ${TESTSDIR}
FILESDIR= ${TESTSDIR}
Index: src/tests/lib/libcurses/t_curses.sh
diff -u src/tests/lib/libcurses/t_curses.sh:1.3 src/tests/lib/libcurses/t_curses.sh:1.4
--- src/tests/lib/libcurses/t_curses.sh:1.3 Fri Jun 17 12:30:58 2011
+++ src/tests/lib/libcurses/t_curses.sh Fri Jun 17 12:59:51 2011
@@ -3,11 +3,6 @@
{
file="$(atf_get_srcdir)/tests/${1}"
- HOME=$(atf_get_srcdir)
- CHECK_PATH=
- INCLUDE_PATH=$(atf_get_srcdir)/tests
- export CHECK_PATH INCLUDE_PATH HOME
-
$(atf_get_srcdir)/director \
-T $(atf_get_srcdir) \
-t atf \
Index: src/tests/lib/libcurses/director/director.c
diff -u src/tests/lib/libcurses/director/director.c:1.6 src/tests/lib/libcurses/director/director.c:1.7
--- src/tests/lib/libcurses/director/director.c:1.6 Thu Jun 16 22:15:28 2011
+++ src/tests/lib/libcurses/director/director.c Fri Jun 17 12:59:51 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: director.c,v 1.6 2011/06/17 02:15:28 christos Exp $ */
+/* $NetBSD: director.c,v 1.7 2011/06/17 16:59:51 christos Exp $ */
/*-
* Copyright 2009 Brett Lymn <bl...@netbsd.org>
@@ -199,16 +199,14 @@
if (S_ISDIR(st.st_mode)) {
char tinfo[MAXPATHLEN];
- snprintf(tinfo, sizeof(tinfo), "%s/%s", termpath,
- ".terminfo.db");
- if (stat(tinfo, &st) == -1) {
- snprintf(tinfo, sizeof(tinfo), "%s/%s", termpath,
- "terminfo.db");
- if (stat(tinfo, &st) == -1)
- err(1, "Cannot stat `%s/%s' or `%s/%s'",
- termpath, "terminfo.db", termpath,
- ".terminfo.db");
- }
+ int l = snprintf(tinfo, sizeof(tinfo), "%s/%s", termpath,
+ "terminfo.db");
+ if (stat(tinfo, &st) == -1)
+ err(1, "Cannot stat `%s'", tinfo);
+ if (l >= 3)
+ tinfo[l - 3] = '\0';
+ if (setenv("TERMINFO", tinfo, 1) != 0)
+ err(1, "Failed to set TERMINFO variable");
} else {
int fd;
char *tinfo;
@@ -218,7 +216,7 @@
fd, 0)) == MAP_FAILED)
err(1, "Cannot map `%s'", termpath);
if (setenv("TERMINFO", tinfo, 1) != 0)
- err(2, "Failed to set TERMINFO variable");
+ err(1, "Failed to set TERMINFO variable");
close(fd);
munmap(tinfo, (size_t)st.st_size);
}
