BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / vgrind / vgrind.sh

diff --git a/usr/src/usr.bin/vgrind/vgrind.sh b/usr/src/usr.bin/vgrind/vgrind.sh
index 2600b22..d7fa30b 100644 (file)
--- a/usr/src/usr.bin/vgrind/vgrind.sh
+++ b/usr/src/usr.bin/vgrind/vgrind.sh
@@ -3,26 +3,44 @@
 # Copyright (c) 1980 The Regents of the University of California.
 # All rights reserved.
 #
 # Copyright (c) 1980 The Regents of the University of California.
 # All rights reserved.
 #

-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+# 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.

 #
 #

-#      @(#)vgrind.sh   5.4 (Berkeley) %G%
+# 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.

 #
 #

-set b=/usr/lib
+#      @(#)vgrind.sh   5.7 (Berkeley) 4/16/91
+#
+

 set voptions=
 set options=
 set files=
 set f=''
 set head=""
 set voptions=
 set options=
 set files=
 set f=''
 set head=""

+set vf=/usr/libexec/vfontedpr
+set tm=/usr/share/tmac

 top:
 if ($#argv > 0) then
     switch ($1:q)
 top:
 if ($#argv > 0) then
     switch ($1:q)


@@ -91,17 +109,17 @@ if (-r index) then
     sed -f nindex index >xindex
     if ($f == 'filter') then
        if ("$head" != "") then
     sed -f nindex index >xindex
     if ($f == 'filter') then
        if ("$head" != "") then

-           $b/vfontedpr $options -h "$head" $files | cat $b/tmac/tmac.vgrind -
+           $vf $options -h "$head" $files | cat $tm/tmac.vgrind -

        else
        else

-           $b/vfontedpr $options $files | cat $b/tmac/tmac.vgrind -
+           $vf $options $files | cat $tm/tmac.vgrind -

        endif
     else
        if ("$head" != "") then
        endif
     else
        if ("$head" != "") then

-           $b/vfontedpr $options -h "$head" $files | \
-               /bin/sh -c "vtroff -rx1 $voptions -i -mvgrind 2>> xindex"
+           $vf $options -h "$head" $files | \
+               sh -c "vtroff -rx1 $voptions -i -mvgrind 2>> xindex"

        else
        else

-           $b/vfontedpr $options $files | \
-               /bin/sh -c "vtroff -rx1 $voptions -i -mvgrind 2>> xindex"
+           $vf $options $files | \
+               sh -c "vtroff -rx1 $voptions -i -mvgrind 2>> xindex"

        endif
     endif
     sort -df +0 -2 xindex >index
        endif
     endif
     sort -df +0 -2 xindex >index


@@ -109,17 +127,15 @@ if (-r index) then
 else
     if ($f == 'filter') then
        if ("$head" != "") then
 else
     if ($f == 'filter') then
        if ("$head" != "") then

-           $b/vfontedpr $options -h "$head" $files | cat $b/tmac/tmac.vgrind -
+           $vf $options -h "$head" $files | cat $tm/tmac.vgrind -

        else
        else

-           $b/vfontedpr $options $files | cat $b/tmac/tmac.vgrind -
+           $vf $options $files | cat $tm/tmac.vgrind -

        endif
     else
        if ("$head" != "") then
        endif
     else
        if ("$head" != "") then

-           $b/vfontedpr $options -h "$head" $files \
-               | vtroff -i $voptions -mvgrind
+           $vf $options -h "$head" $files | vtroff -i $voptions -mvgrind

        else
        else

-           $b/vfontedpr $options $files \
-               | vtroff -i $voptions -mvgrind
+           $vf $options $files | vtroff -i $voptions -mvgrind

        endif
     endif
 endif
        endif
     endif
 endif