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

Fix a logico that sneaked into the manpath handling.

Browse Source 
Turn off error messages from locate(1), we can't do very much about
its database not being ok anyway at this time.

Closes PR # bin/2183: whereis returns environ...
This commit is contained in:
Joerg Wunsch 1996-12-23 18:55:32 +00:00
parent 3d20a1ff03
commit 2fc6cb6a37
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.bin/whereis/whereis.pl
View File

@ -28,7 +28,7 @@
#
# Rewritten from scratch for FreeBSD after the 4.3BSD manual page.
#
# $Id$
# $Id: whereis.pl,v 1.1 1996/06/15 12:29:48 joerg Exp $
#
sub usage
@ -117,13 +117,15 @@ if (!defined(@manuals)) {
#
# first, use default manpath, then append user's $MANPATH
#
local($usermanpath) = $ENV{'MANPATH'};
delete $ENV{'MANPATH'};
local($manpath) = `/usr/bin/manpath`;
local(@list, %path, $i);
chop($manpath);
@list = &decolonify($manpath);
push(@list, &decolonify($ENV{'MANPATH'}));
push(@list, &decolonify($usermanpath));
# remove duplicates
foreach (@list) {
@ -220,7 +222,7 @@ foreach $name (@names) {
# source directories, and at least one further level of
# subdirectories.
#
if (!$found && open(LOCATE, "locate */$name|")) {
if (!$found && open(LOCATE, "locate */$name 2>/dev/null |")) {
locate_item:
while (chop($loc = <LOCATE>)) {
foreach (@sources) {