Don't strip trailing .suffixes from filenames. Although obviously

intentional, this behaviour is far too obnoxious given the number of
filenames such as rpc.statd we have.

Submitted by:	Chris Costello [3]chris@calldei.com (bin/11303)

2 files changed, 6 insertions, 5 deletions

diff --git a/usr.bin/whereis/whereis.1 b/usr.bin/whereis/whereis.1
index 637cca17b152..b569301bdf42 100644
--- a/usr.bin/whereis/whereis.1
+++ b/usr.bin/whereis/whereis.1
@@ -31,7 +31,7 @@
 .\"
 .\"	@(#)whereis.1	8.2 (Berkeley) 12/30/93
 .\"
-.\" $Id: whereis.1,v 1.5 1998/05/15 11:22:40 jkoshy Exp $
+.\" $Id: whereis.1,v 1.6 1998/08/31 16:41:08 wosch Exp $
 .\"
 .Dd June 15, 1996
 .Dt WHEREIS 1
@@ -51,8 +51,10 @@ The
 utility checks the standard binary, manual page, and source
 directories for the specified programs, printing out the paths of any
 it finds.  The supplied names are first stripped of leading path name
-components, any single trailing extension of the form
-.Ql .ext ,
+components, any single trailing extension added by
+.Xr gzip 1
+or
+.Xr compress 1 ,
 and the leading
 .Ql s.
 or trailing
diff --git a/usr.bin/whereis/whereis.pl b/usr.bin/whereis/whereis.pl
index 38352533c2db..f53d2a6fb2be 100644
--- a/usr.bin/whereis/whereis.pl
+++ b/usr.bin/whereis/whereis.pl
@@ -28,7 +28,7 @@
 #
 # Rewritten from scratch for FreeBSD after the 4.3BSD manual page.
 #
-# $Id: whereis.pl,v 1.5 1997/12/22 19:11:28 ache Exp $
+# $Id: whereis.pl,v 1.6 1998/10/04 10:33:37 obrien Exp $
 #
 
 sub usage
@@ -176,7 +176,6 @@ foreach $name (@names) {
     $name =~ s|^.*/||;		# strip leading path name component
     $name =~ s/,v$//; $name =~ s/^s\.//; # RCS or SCCS suffix/prefix
     $name =~ s/\.(Z|z|gz)$//;	# compression suffix
-    $name =~ s/\.[^.]+//;	# any other suffix
 
     $line = "";
     $unusual = 0;