Module Name: src
Committed By: roy
Date: Wed Feb 3 18:11:18 UTC 2010
Modified Files:
src/include: paths.h
src/usr.bin/getent: getent.1 getent.c
Log Message:
getent cannot report on termcap as we now use terminfo.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/include/paths.h
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/getent/getent.1
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/getent/getent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/paths.h
diff -u src/include/paths.h:1.35 src/include/paths.h:1.36
--- src/include/paths.h:1.35 Tue Dec 22 14:24:37 2009
+++ src/include/paths.h Wed Feb 3 18:11:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: paths.h,v 1.35 2009/12/22 14:24:37 pooka Exp $ */
+/* $NetBSD: paths.h,v 1.36 2010/02/03 18:11:18 roy Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -91,7 +91,6 @@
#define _PATH_SOUND "/dev/sound"
#define _PATH_SOUND0 "/dev/sound0"
#define _PATH_SYSMON "/dev/sysmon"
-#define _PATH_TERMCAP "/usr/share/misc/termcap"
#define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "/netbsd"
#define _PATH_URANDOM "/dev/urandom"
Index: src/usr.bin/getent/getent.1
diff -u src/usr.bin/getent/getent.1:1.19 src/usr.bin/getent/getent.1:1.20
--- src/usr.bin/getent/getent.1:1.19 Sun Mar 15 15:19:57 2009
+++ src/usr.bin/getent/getent.1 Wed Feb 3 18:11:18 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: getent.1,v 1.19 2009/03/15 15:19:57 joerg Exp $
+.\" $NetBSD: getent.1,v 1.20 2010/02/03 18:11:18 roy Exp $
.\"
.\" Copyright (c) 2004 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 May 14, 2008
+.Dd February 3, 2010
.Dt GETENT 1
.Os
.Sh NAME
@@ -68,7 +68,6 @@
.It rpc Ta name number [alias ...]
.It services Ta name port/protocol [alias ...]
.It shells Ta /path/to/shell
-.It termcap Ta entry
.El
.Pp
If one or more
@@ -98,8 +97,7 @@
.Xr cgetcap 3
style databases (
.Sy disktab ,
-.Sy printcap ,
-.Sy termcap )
+.Sy printcap)
specifying a key, lists the entry for that key, and specifying more arguments
after the key are used as fields in that key, and only the values of the keys
are returned.
@@ -131,8 +129,7 @@
.Xr printcap 5 ,
.Xr rpc 5 ,
.Xr services 5 ,
-.Xr shells 5 ,
-.Xr termcap 5
+.Xr shells 5
.Sh HISTORY
A
.Nm
Index: src/usr.bin/getent/getent.c
diff -u src/usr.bin/getent/getent.c:1.16 src/usr.bin/getent/getent.c:1.17
--- src/usr.bin/getent/getent.c:1.16 Sun Apr 12 10:27:08 2009
+++ src/usr.bin/getent/getent.c Wed Feb 3 18:11:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: getent.c,v 1.16 2009/04/12 10:27:08 lukem Exp $ */
+/* $NetBSD: getent.c,v 1.17 2010/02/03 18:11:18 roy Exp $ */
/*-
* Copyright (c) 2004-2006 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: getent.c,v 1.16 2009/04/12 10:27:08 lukem Exp $");
+__RCSID("$NetBSD: getent.c,v 1.17 2010/02/03 18:11:18 roy Exp $");
#endif /* not lint */
#include <sys/socket.h>
@@ -80,7 +80,6 @@
static int rpc(int, char *[]);
static int services(int, char *[]);
static int shells(int, char *[]);
-static int termcap(int, char *[]);
enum {
RV_OK = 0,
@@ -106,7 +105,6 @@
{ "rpc", rpc, },
{ "services", services, },
{ "shells", shells, },
- { "termcap", termcap, },
{ NULL, NULL, },
};
@@ -683,15 +681,6 @@
}
/*
- * termcap
- */
-
-static int
-termcap(int argc, char *argv[])
-{
- return handlecap(_PATH_TERMCAP, argc, argv);
-}
- /*
* protocols
*/
