d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove -p flag.

Browse Source 
OpenBSD's implementation lacks -p, and we don't want to
support the option now, only to lose it if/when we later
switch to OpenBSD's implementation.
This functionality is provided by which(1).

Approved by:    sheldonh (mentor)
This commit is contained in:
Johan Karlsson 2002-07-03 19:19:54 +00:00
parent 9d1b456e66
commit 058e185122
2 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.bin/whereis/whereis.1
View File

@ -42,7 +42,6 @@
.Nd locate programs
.Sh SYNOPSIS
.Nm
.Op Fl p
.Ar program
.Op Ar program ...
.Sh DESCRIPTION
@ -56,12 +55,6 @@ The default path searched is the string returned by the
utility for the
.Dq user.cs_path
string.
If the
.Op Fl p
option is specified, then the value of the environment
variable
.Ev PATH
is used instead.
.Sh SEE ALSO
.Xr which 1 ,
.Xr sysctl 8

42
usr.bin/whereis/whereis.c
View File

@ -65,14 +65,9 @@ main(argc, argv)
size_t len;
int ch, sverrno, mib[2];
char *p, *t, *std, path[MAXPATHLEN];
int useenvpath = 0;
while ((ch = getopt(argc, argv, "p")) != -1)
while ((ch = getopt(argc, argv, "")) != -1)
switch (ch) {
case 'p':
useenvpath = 1; /* use environment for PATH */
break;
case '?':
default:
usage();
@ -83,25 +78,20 @@ main(argc, argv)
if (argc == 0)
usage();
if (useenvpath) {
if ((std = getenv("PATH")) == NULL)
err(1, "getenv: PATH" );
} else {
/* 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");
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");
}
/* 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");
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... */
@ -129,6 +119,6 @@ void
usage()
{
(void)fprintf(stderr, "usage: whereis [-p] program [...]\n");
(void)fprintf(stderr, "usage: whereis program [...]\n");
exit (1);
}