From: millert Date: Tue, 8 Apr 1997 02:50:11 +0000 (+0000) Subject: Obseleted by new which(1) that acts like whereis(1) when invoked X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2bdef69b200763973ede9e8a6b0f34ae55ce4fad;p=openbsd Obseleted by new which(1) that acts like whereis(1) when invoked which "whereis" as argv[0]. --- diff --git a/usr.bin/whereis/Makefile b/usr.bin/whereis/Makefile deleted file mode 100644 index 77ecaf558bf..00000000000 --- a/usr.bin/whereis/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# $OpenBSD: Makefile,v 1.2 1996/06/26 05:42:55 deraadt Exp $ - -PROG= whereis - -.include diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1 deleted file mode 100644 index 3369b73ecfb..00000000000 --- a/usr.bin/whereis/whereis.1 +++ /dev/null @@ -1,66 +0,0 @@ -.\" $OpenBSD: whereis.1,v 1.2 1996/06/26 05:42:56 deraadt Exp $ -.\" $NetBSD: whereis.1,v 1.4 1995/08/31 21:54:51 jtc Exp $ -.\" -.\" Copyright (c) 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. 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. -.\" -.\" @(#)whereis.1 8.3 (Berkeley) 4/27/95 -.\" -.Dd April 27, 1995 -.Dt WHEREIS 1 -.Os BSD 3 -.Sh NAME -.Nm whereis -.Nd locate programs -.Sh SYNOPSIS -.Nm whereis -.Op Ar program ... -.Sh DESCRIPTION -The -.Nm whereis -utility checks the standard binary directories for the specified programs, -printing out the paths of any it finds. -.Pp -The path searched is the string returned by the -.Xr sysctl 8 -utility for the -.Dq user.cs_path -string. -.Sh SEE ALSO -.Xr sysctl 8 -.Sh COMPATIBILITY -The historic flags and arguments for the -.Nm whereis -utility are no longer available in this version. -.Sh HISTORY -The -.Nm whereis -command appeared in 3.0BSD. diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c deleted file mode 100644 index df6a0ce2aaa..00000000000 --- a/usr.bin/whereis/whereis.c +++ /dev/null @@ -1,127 +0,0 @@ -/* $OpenBSD: whereis.c,v 1.4 1997/01/23 10:37:40 deraadt Exp $ */ -/* $NetBSD: whereis.c,v 1.6 1995/08/31 21:54:52 jtc Exp $ */ - -/*- - * Copyright (c) 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. 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. - */ - -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)whereis.c 8.3 (Berkeley) 5/4/95"; -#endif -static char *rcsid = "$OpenBSD: whereis.c,v 1.4 1997/01/23 10:37:40 deraadt Exp $"; -#endif /* not lint */ - -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -void usage __P((void)); - -int -main(argc, argv) - int argc; - char *argv[]; -{ - struct stat sb; - size_t len; - int ch, sverrno, mib[2]; - char *p, *t, *std, path[MAXPATHLEN]; - - while ((ch = getopt(argc, argv, "")) != -1) - switch (ch) { - case '?': - default: - usage(); - } - argc -= optind; - argv += optind; - - if (argc == 0) - usage(); - - /* Retrieve the standard path. */ - mib[0] = CTL_USER; - mib[1] = USER_CS_PATH; - if (sysctl(mib, 2, NULL, &len, NULL, 0) == -1) - return (-1); - if (len == 0) - err(1, "user_cs_path: sysctl: zero length\n"); - if ((std = malloc(len)) == NULL) - err(1, NULL); - if (sysctl(mib, 2, std, &len, NULL, 0) == -1) { - sverrno = errno; - free(std); - errno = sverrno; - err(1, "sysctl: user_cs_path"); - } - - /* For each path, for each program... */ - for (; *argv; ++argv) - for (p = std;; *p++ = ':') { - t = p; - if ((p = strchr(p, ':')) != NULL) { - *p = '\0'; - if (t == p) - t = "."; - } else - if (strlen(t) == 0) - t = "."; - (void)snprintf(path, sizeof(path), "%s/%s", t, *argv); - if (!stat(path, &sb)) - (void)printf("%s\n", path); - if (p == NULL) - break; - } - return (0); -} - -void -usage() -{ - - (void)fprintf(stderr, "usage: whereis program [...]\n"); - exit (1); -}