X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=rc%2Fbin%2Fman;h=f002c21215781aa3a0ecd4c0faa37579bde8369e;hb=af95aa431d6e511355a6eb953ab7845f94c0e2d7;hp=37043d16e4df3e802d527211ace0f2f2da590ec8;hpb=a9060cc06bee66e12fe16644511f181a4b0cdbd3;p=plan9front.git

diff --git a/rc/bin/man b/rc/bin/man
old mode 100644
new mode 100755
index 37043d16e..f002c2121
--- a/rc/bin/man
+++ b/rc/bin/man
@@ -59,8 +59,8 @@ fn page {
 search=yes
 while(~ $d 0) {
 	if(~ $#* 0) {
-		echo 'Usage: man [-bntpPSw] [0-9] [0-9] ... name1 name2 ...' >[1=2]
-		exit
+		echo 'usage: man [-bntpPSw] [0-9] [0-9] ... name1 name2 ...' >[1=2]
+		exit usage
 	}
 	if(test -d $S/$1){
 		sec=($sec $1)
@@ -109,41 +109,49 @@ if(~ $#fils 0) {
 		exit 'no man'
 	}
 }
-for(i in $fils) {
-	if(! /bin/test -f $i)
-		echo need $i >[1=2]
-	if not {
-		switch($cmd) {
-		case w
-			echo $i
+switch($cmd) {
+case p; out=proof
+case P; out=page
+case *; out=cat
+}
+{
+	for(i in $fils) {
+		if(! /bin/test -f $i)
+			echo need $i >[1=2]
+		if not {
+			switch($cmd) {
+			case w
+				echo $i
 
-		case t
-			roff t $i
+			case t
+				roff t $i
 
-		case p
-			roff t $i | grep -v '^x X html' | proof
+			case p
+				roff t $i | grep -v '^x X html'
 
-		case P
-			roff t $i | page
+			case P
+				roff t $i
 
-		case n
-			roff n $i | sed '
-				${
-        			       /^$/p
-				}
-				//N
-				/^\n$/D'
+			case n
+				roff n $i | sed '
+					${
+        				       /^$/p
+					}
+					//N
+					/^\n$/D'
 
-		case b
-			x=`{echo $i | sed 's;/sys/man/(.*)/(.*);\1 \2;'}
-			if(~ $x(2) 0intro) x=($x(1) intro)
-			roff n $i | sed '
-				${
-        			       /^$/p
-				}
-				//N
-				/^\n$/D' |
-			plumb -i -d edit -a 'action=showdata filename=/man/'$x(2)^'('$x(1)^')'
+			case b
+				x=`{echo $i | sed 's;/sys/man/(.*)/(.*);\1 \2;'}
+				if(~ $x(2) 0intro) x=($x(1) intro)
+				roff n $i | sed '
+					${
+        				       /^$/p
+					}
+					//N
+					/^\n$/D' |
+				plumb -i -d edit -a 'action=showdata filename=/man/'$x(2)^'('$x(1)^')'
+			}
 		}
 	}
-}
+} | $out
+