From 5959d954ea63def8f9879fd9b919dfca483874f9 Mon Sep 17 00:00:00 2001 From: Thomas Cort Date: Wed, 30 Oct 2013 12:40:47 -0400 Subject: [PATCH] Importing usr.bin/what No Minix-specific changes needed. Change-Id: I08ee48e2ebcdf5c87b557b44a5046b7382b120e5 --- distrib/sets/lists/minix/mi | 2 + releasetools/nbsd_ports | 1 + usr.bin/Makefile | 2 +- usr.bin/what/Makefile | 6 ++ usr.bin/what/what.1 | 82 +++++++++++++++++++++++ usr.bin/what/what.c | 128 ++++++++++++++++++++++++++++++++++++ 6 files changed, 220 insertions(+), 1 deletion(-) create mode 100644 usr.bin/what/Makefile create mode 100644 usr.bin/what/what.1 create mode 100644 usr.bin/what/what.c diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi index fafc3ddfc..2365a245f 100644 --- a/distrib/sets/lists/minix/mi +++ b/distrib/sets/lists/minix/mi @@ -550,6 +550,7 @@ ./usr/bin/vis minix-sys ./usr/bin/vol minix-sys ./usr/bin/wc minix-sys +./usr/bin/what minix-sys ./usr/bin/whatis minix-sys ./usr/bin/whereis minix-sys ./usr/bin/which minix-sys @@ -2123,6 +2124,7 @@ ./usr/man/man1/vol.1 minix-sys ./usr/man/man1/wait.1 minix-sys ./usr/man/man1/wc.1 minix-sys +./usr/man/man1/what.1 minix-sys ./usr/man/man1/whatis.1 minix-sys ./usr/man/man1/whereis.1 minix-sys ./usr/man/man1/which.1 minix-sys diff --git a/releasetools/nbsd_ports b/releasetools/nbsd_ports index 0e53993b2..b5c23c096 100644 --- a/releasetools/nbsd_ports +++ b/releasetools/nbsd_ports @@ -231,6 +231,7 @@ 2013/10/23 12:00:00,usr.bin/uuidgen 2012/10/17 12:00:00,usr.bin/vis 2012/10/17 12:00:00,usr.bin/wc +2012/10/17 12:00:00,usr.bin/what 2013/03/22 12:00:00,usr.bin/whatis 2013/03/15 12:00:00,usr.bin/who 2012/10/17 12:00:00,usr.bin/whois diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 094e696a2..4e3f180a7 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -31,7 +31,7 @@ SUBDIR= asa \ uniq units unvis unzip users \ uuidgen vis \ \ - wc whatis who whois \ + wc what whatis who whois \ write xargs xinstall xstr yes .if !defined(__MINIX) diff --git a/usr.bin/what/Makefile b/usr.bin/what/Makefile new file mode 100644 index 000000000..41d719036 --- /dev/null +++ b/usr.bin/what/Makefile @@ -0,0 +1,6 @@ +# $NetBSD: Makefile,v 1.3 1994/11/17 06:59:37 jtc Exp $ +# @(#)Makefile 8.1 (Berkeley) 6/6/93 + +PROG= what + +.include diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1 new file mode 100644 index 000000000..f29c2bdae --- /dev/null +++ b/usr.bin/what/what.1 @@ -0,0 +1,82 @@ +.\" $NetBSD: what.1,v 1.13 2003/08/07 11:17:15 agc Exp $ +.\" +.\" Copyright (c) 1980, 1991, 1993 +.\" The Regents of the University of California. All rights reserved. +.\" +.\" 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. 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. +.\" +.\" @(#)what.1 8.1 (Berkeley) 6/6/93 +.\" +.Dd February 22, 1999 +.Dt WHAT 1 +.Os +.Sh NAME +.Nm what +.Nd search files for SCCS identifiers +.Sh SYNOPSIS +.Nm +.Op Fl s +.Ar +.Sh DESCRIPTION +The +.Nm +utility reads each +.Ar file +operand and searches for sequences of the form +.Dq \&@(#) +as inserted by the source code control system. +It prints the remainder of the string following this marker, up to +a null character, newline, double quote, backslash, or +.Dq \&\*[Gt] +character. +.Pp +If the +.Fl s +option is specified, only the first occurrence of an identification string in +each file is printed. +.Sh EXIT STATUS +The +.Nm +utility exits 0 if any matches were found, and 1 otherwise. +.Sh STANDARDS +The +.Nm +utility conforms to +.St -xpg4.2 . +.Sh HISTORY +The +.Nm +command appeared in +.Bx 4.0 . +.Sh BUGS +As +.Bx +is not licensed to distribute +.Tn SCCS +this is a rewrite of the +.Nm +command which is part of +.Tn SCCS , +and may not behave exactly the same as that command does. diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c new file mode 100644 index 000000000..b337081b4 --- /dev/null +++ b/usr.bin/what/what.c @@ -0,0 +1,128 @@ +/* $NetBSD: what.c,v 1.11 2011/09/06 18:45:49 joerg Exp $ */ + +/* + * Copyright (c) 1980, 1988, 1993 + * The Regents of the University of California. All rights reserved. + * + * 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. 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. + */ + +#include +#ifndef lint +__COPYRIGHT("@(#) Copyright (c) 1980, 1988, 1993\ + The Regents of the University of California. All rights reserved."); +#endif /* not lint */ + +#ifndef lint +#if 0 +static char sccsid[] = "@(#)what.c 8.1 (Berkeley) 6/6/93"; +#endif +__RCSID("$NetBSD: what.c,v 1.11 2011/09/06 18:45:49 joerg Exp $"); +#endif /* not lint */ + +#include +#include +#include +#include + +static void search(void); +__dead static void usage(void); + +static int matches; +static int sflag; + +/* + * what + */ +/* ARGSUSED */ +int +main(int argc, char **argv) +{ + int c; + + (void)setlocale(LC_ALL, ""); + + matches = sflag = 0; + while ((c = getopt(argc, argv, "s")) != -1) { + switch (c) { + case 's': + sflag = 1; + break; + case '?': + default: + usage(); + } + } + argc -= optind; + argv += optind; + + if (argc < 1) { + usage(); + } else do { + if (freopen(*argv, "r", stdin) == NULL) { + perror(*argv); + exit(matches ? EXIT_SUCCESS : 1); + } + printf("%s\n", *argv); + search(); + } while (*++argv != NULL); + + /* Note: the standard explicitly specifies an exit status of 1. */ + exit(matches ? EXIT_SUCCESS : 1); + /* NOTREACHED */ +} + +static void +search(void) +{ + int c; + + while ((c = getchar()) != EOF) { +loop: if (c != '@') + continue; + if ((c = getchar()) != '(') + goto loop; + if ((c = getchar()) != '#') + goto loop; + if ((c = getchar()) != ')') + goto loop; + putchar('\t'); + while ((c = getchar()) != EOF && c != '\0' && c != '"' && + c != '>' && c != '\n' && c != '\\') + putchar(c); + putchar('\n'); + matches++; + if (sflag) + break; + } +} + +static void +usage(void) +{ + + (void)fprintf(stderr, "usage: what [-s] file ...\n"); + exit(1); +}