From 10f99a3e6a90e36a7503b5294c0a11f7671d62c1 Mon Sep 17 00:00:00 2001 From: downsj Date: Mon, 3 Feb 1997 05:10:55 +0000 Subject: [PATCH] sync to netbsd 970101 --- usr.sbin/grfinfo/Makefile | 4 +-- usr.sbin/grfinfo/grfinfo.1 | 70 ++++++++++++++++++++++++++++++++++++++ usr.sbin/grfinfo/grfinfo.c | 9 +++-- 3 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 usr.sbin/grfinfo/grfinfo.1 diff --git a/usr.sbin/grfinfo/Makefile b/usr.sbin/grfinfo/Makefile index 2aaa0e053a1..8c02dc1c840 100644 --- a/usr.sbin/grfinfo/Makefile +++ b/usr.sbin/grfinfo/Makefile @@ -1,7 +1,7 @@ -# $Id: Makefile,v 1.1.1.1 1995/10/18 08:47:34 deraadt Exp $ +# $OpenBSD: Makefile,v 1.2 1997/02/03 05:10:55 downsj Exp $ +# $NetBSD: Makefile,v 1.3 1997/01/31 23:12:12 carrel Exp $ PROG= grfinfo -NOMAN= CFLAGS+= -I${.CURDIR}/../../sys/arch/hp300 .include diff --git a/usr.sbin/grfinfo/grfinfo.1 b/usr.sbin/grfinfo/grfinfo.1 new file mode 100644 index 00000000000..71d278cd720 --- /dev/null +++ b/usr.sbin/grfinfo/grfinfo.1 @@ -0,0 +1,70 @@ +.\" $OpenBSD: grfinfo.1,v 1.1 1997/02/03 05:10:57 downsj Exp $ +.\" $NetBSD: grfinfo.1,v 1.1 1997/01/31 23:06:53 carrel Exp $ +.\" +.\" Copyright (c) 1997 The NetBSD Foundation, Inc. +.\" All rights reserved. +.\" +.\" This code is derived from software contributed to The NetBSD Foundation +.\" by Dave Carrel +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by the University of +.\" California, Berkeley and its contributors. +.\" 4. Neither the name of the University nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd January 31, 1997 +.Dt GRFINFO 1 +.Os +.Sh NAME +.Nm grfinfo +.Nd Display information about grf graphics devices. +.Sh SYNOPSIS +.Nm grfinfo +.Op Fl at +.Ar file +.Sh DESCRIPTION +The +.Nm grfinfo +utility displays information about grf graphics frame buffer devices. By +default, only the frame buffer type is displayed. +.Ar file +is the device file for the graphics frame buffer. +.Pp +The options are as follows: +.Bl -tag -width flag +.It Fl a +Display all possible information. +.It Fl t +Display only the type, even if an error occurs. +.Sh DIAGNOSTICS +The +.Nm grfinfo +utility exits 0 on success, and >0 if an error occurs. If the +.Fl t +option is used and an error occurs, no error message is displayed, and the +type is displayed as "none". +.Sh SEE ALSO +.Xr grf 4 diff --git a/usr.sbin/grfinfo/grfinfo.c b/usr.sbin/grfinfo/grfinfo.c index 9ab8bbc9c80..1f67677944c 100644 --- a/usr.sbin/grfinfo/grfinfo.c +++ b/usr.sbin/grfinfo/grfinfo.c @@ -1,3 +1,5 @@ +/* $OpenBSD: grfinfo.c,v 1.3 1997/02/03 05:10:59 downsj Exp $ */ + /* * Copyright (c) 1987-1993, The University of Utah and * the Center for Software Science at the University of Utah (CSS). @@ -19,7 +21,6 @@ * improvements that they make and grant CSS redistribution rights. * * from: Utah $Hdr: grfinfo.c 1.3 94/04/04$ - * $Id: grfinfo.c,v 1.2 1997/01/15 23:43:56 millert Exp $ */ #include @@ -28,7 +29,7 @@ #include int aflg = 0; -int tflg = 1; +int tflg = 0; char *pname; char *dname, *tname(); struct grfinfo gi; @@ -40,6 +41,8 @@ struct grf_info { GRFGATOR, "gatorbox", GRFBOBCAT, "topcat", GRFRBOX, "renaissance", + GRFFIREEYE, "fireeye", + GRFHYPERION, "hyperion", GRFDAVINCI, "davinci", -1, "unknown", }; @@ -72,7 +75,7 @@ main(argc, argv) getinfo(); if (aflg) printall(); - else if (tflg) + else printf("%s\n", tname()); exit(0); } -- 2.20.1