From 02101751073e4a2f43f2f9b3c604083b800f7cb4 Mon Sep 17 00:00:00 2001 From: wosch Date: Tue, 27 Aug 1996 20:04:45 +0000 Subject: sync copyright with /usr/share/examples/etc/bsd-style-copyright --- usr.bin/which/which.1 | 4 ++-- usr.bin/which/which.pl | 35 ++++++++++++++--------------------- 2 files changed, 16 insertions(+), 23 deletions(-) (limited to 'usr.bin/which') diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1 index f37f2f9..85242289 100644 --- a/usr.bin/which/which.1 +++ b/usr.bin/which/which.1 @@ -27,7 +27,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE .\" OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $Id: which.1,v 1.4 1996/08/17 23:31:38 wosch Exp $ +.\" $Id: which.1,v 1.5 1996/08/23 00:57:04 mpp Exp $ .Dd January 26, 1995 .Dt WHICH 1 .Os FreeBSD @@ -62,4 +62,4 @@ command first appeared in .Sh AUTHOR The PERL script for this more modern version of .Nm which -was written by Wolfram Schneider . +was written by Wolfram Schneider . diff --git a/usr.bin/which/which.pl b/usr.bin/which/which.pl index edf4c20..28c05f4 100755 --- a/usr.bin/which/which.pl +++ b/usr.bin/which/which.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl # -# Copyright (C) 1995, Wolfram Schneider +# Copyright (c) 1995 Wolfram Schneider . Berlin. +# All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -10,28 +11,20 @@ # 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 Wolfram Schneider -# and the FreeBSD Project. -# 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 CONTRIBUTOR ``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 CONTRIBUTOR 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. +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. # -# [whew!] -# -# $Id: which.pl,v 1.5 1995/07/31 04:22:07 asami Exp $ +# $Id: which.pl,v 1.6 1995/08/02 07:30:37 asami Exp $ $all = 0; $silent = 0; -- cgit v1.1