tbin/", bin/"": simplify - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 9fb7a4f7f7b78476d496cac2b83f9006acd7f483
DIR parent 18ee9a80f1a2f0e95982a90e40fd052fdae1c2c9
HTML Author: Arvindh Rajesh Tamilmani <art@a-30.net>
Date: Wed, 19 May 2010 18:20:10 -0700
bin/", bin/"": simplify
R=rsc
CC=codebot
http://codereview.appspot.com/953047
Diffstat:
M bin/" | 10 +++-------
M bin/"" | 21 ++++++---------------
2 files changed, 9 insertions(+), 22 deletions(-)
---
DIR diff --git a/bin/" b/bin/"
t@@ -21,11 +21,7 @@ switch($#*) {
case 0
cmds | tail -1
case *
- cmds | grep '^ '^$"* | {echo; cat} |
- pr -t -n | sort -nr | sort -u +1 | sort -n |
- sed 's/^ *[0-9]+ //' | grep .
+ cmds | grep -n '^ '^$"* | tail -r |
+ sort -u +1 | sort -n |
+ sed 's/^[0-9]+: //'
}
-
-# the silly {echo; cat} gets around pr printing "empty file" when
-# presented with no input.
-
DIR diff --git a/bin/"" b/bin/""
t@@ -1,19 +1,10 @@
#!/usr/local/plan9/bin/rc
-PROMPT='[^ ]*[%;$#][ ]+'
-
-" $* |
- grep -v '^'$PROMPT'""' |
- tail -1 |
- tee >{wc -l >/tmp/qq.$pid} |
- tee /dev/stderr |
- 9 sed 's/^ '$PROMPT'//' |
- rc
-
-if(~ `{cat /tmp/qq.$pid} 0){
- rm /tmp/qq.$pid
- echo no such command found
+cmd = `{" $* | tail -1}
+if (~ $#cmd 0) {
+ echo no such command found >[1=2]
exit notfound
}
-rm /tmp/qq.$pid
-exit 0
+
+echo ' ' $cmd >[1=2]
+rc -c $"cmd