aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsc <devnull@localhost>2005-03-18 19:50:15 +0000
committerrsc <devnull@localhost>2005-03-18 19:50:15 +0000
commita5a494c16724e3f31f6660ad22117a2da393191e (patch)
treec2f88a9cead20d17c421bb74b38dbd465ff19f92
parentbc18537a3f1dcf7fdc912b6973bc1ec9455dbd1f (diff)
downloadplan9port-a5a494c16724e3f31f6660ad22117a2da393191e.tar.gz
plan9port-a5a494c16724e3f31f6660ad22117a2da393191e.tar.bz2
plan9port-a5a494c16724e3f31f6660ad22117a2da393191e.zip
allow -l without -i
-rw-r--r--rcmain14
1 files changed, 9 insertions, 5 deletions
diff --git a/rcmain b/rcmain
index 19dd5772..2a0174bf 100644
--- a/rcmain
+++ b/rcmain
@@ -20,8 +20,9 @@ if(! ~ $#cflag 0){
if(flag l && test -r $home/lib/profile) . $home/lib/profile
status=''
eval $cflag
+ exit $status
}
-if not if(flag i){
+if(flag i){
if(~ $TERM 9term){
if(~ $#'fn#cd' 0)
fn cd { builtin cd $1 && flag i && awd }
@@ -31,10 +32,13 @@ if not if(flag i){
status=''
if(! ~ $#* 0) . $*
. -i '/dev/stdin'
+ exit $status
}
-if not if(~ $#* 0) . '/dev/stdin'
-if not{
- status=''
- . $*
+if(flag l && test -r $home/lib/profile) . $home/lib/profile
+if(~ $#* 0){
+ . /dev/stdin
+ exit $status
}
+status=''
+. $*
exit $status