The macro dfinition names have been changed to not interfere

with other macro packages for troff.

SCCS-vsn: usr.bin/vgrind/vgrind.sh 1.7

diff --git a/usr/src/usr.bin/vgrind/vgrind.sh b/usr/src/usr.bin/vgrind/vgrind.sh
index dc32e89..c85b398 100644 (file)
--- a/usr/src/usr.bin/vgrind/vgrind.sh
+++ b/usr/src/usr.bin/vgrind/vgrind.sh
@@ -2,53 +2,108 @@
 # vgrind
 #
 set b=/usr/lib
 # vgrind
 #
 set b=/usr/lib

-set o=
-set t=
+set voptions=
+set options=
+set files=

 set f=''
 set f=''

-set wide = ""
+set head=""

 top:
 top:

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

 
 

-       case -f:
-               set f='filter'
-               shift
-               goto top
+    case -f:
+       set f='filter'
+       set options = "$options $1:q"
+       shift
+       goto top

 
 

-       case -t:
-               set t=-t
-               shift
-               goto top
+    case -t:
+       set voptions = "$voptions -t"
+       shift
+       goto top

 
 

-       case -o*:
-               set o=$1:q
-               shift
-               goto top
+    case -o*:
+       set voptions="$voptions $1:q"
+       shift
+       goto top

 
 

-       case -W:
-               set wide = "-W"
-               shift
-               goto top
-       endsw
+    case -W:
+       set voptions = "$voptions -W"
+       shift
+       goto top
+
+    case -d:
+       if ($#argv < 2) then
+           echo "vgrind: $1:q option must have argument"
+           goto done
+       else
+           set options = ($options $1:q $2)
+           shift
+           shift
+           goto top
+       endif
+                       
+    case -h:
+       if ($#argv < 2) then
+           echo "vgrind: $1:q option must have argument"
+           goto done
+       else
+           set head="$2"
+           shift
+           shift
+           goto top
+       endif
+                       
+    case -*:
+       set options = "$options $1:q"
+       shift
+       goto top
+
+    default:
+       set files = "$files $1:q"
+       shift
+       goto top
+    endsw

 endif
 if (-r index) then
 endif
 if (-r index) then

-       echo > nindex
-       foreach i ($*:q)
-               echo "/ $i /d" >> nindex
-       end
-       sed -f nindex index >xindex
-       if ($f == 'filter') then
-           $b/vfontedpr -f $*:q | cat /usr/lib/tmac/tmac.vgrind -
+    echo > nindex
+    foreach i ($files)
+       echo "/ $i /d" >> nindex
+    end
+    sed -f nindex index >xindex
+    if ($f == 'filter') then
+       if ("$head" != "") then
+           $b/vfontedpr $options -h "$head" $files | cat $b/tmac/tmac.vgrind -

        else
        else

-           $b/vfontedpr $*:q | \
-                   /bin/sh -c "vtroff $t $wide -rx1 $o -i -mvgrind 2>> xindex"
+           $b/vfontedpr $options $files | cat $b/tmac/tmac.vgrind -

        endif
        endif

-       sort -df +0 -2 xindex >index
-       rm nindex xindex
+    else
+       if ("$head" != "") then
+           $b/vfontedpr $options -h "$head" $files | \
+               /bin/sh -c "vtroff -rx1 $voptions -i -mvgrind 2>> xindex"
+       else
+           $b/vfontedpr $options $files | \
+               /bin/sh -c "vtroff -rx1 $voptions -i -mvgrind 2>> xindex"
+       endif
+    endif
+    sort -df +0 -2 xindex >index
+    rm nindex xindex

 else
 else

-       if ($f == 'filter') then
-           $b/vfontedpr -f $*:q | cat /usr/lib/tmac/tmac.vgrind -
+    if ($f == 'filter') then
+       if ("$head" != "") then
+           $b/vfontedpr $options -h "$head" $files | cat $b/tmac/tmac.vgrind -

        else
        else

-           $b/vfontedpr $*:q | vtroff $t $wide -i $o -mvgrind
+           $b/vfontedpr $options $files | cat $b/tmac/tmac.vgrind -

        endif
        endif

+    else
+       if ("$head" != "") then
+           $b/vfontedpr $options -h "$head" $files \
+               | vtroff -i $voptions -mvgrind
+       else
+           $b/vfontedpr $options $files \
+               | vtroff -i $voptions -mvgrind
+       endif
+    endif

 endif
 endif

+
+done: