summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2000-12-30 02:47:29 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2000-12-30 02:47:29 +0000
commit518f903c1aef5539ecafc320cbda5d9bb47785a0 (patch)
treed7209027d0add443267eb137500d21364c6d964f /etc
parent01d7fbad3f4e4aec9e30b607abe3828f1dca2d22 (diff)
Ok, I'll say it again: "fix ^C in termtype prompt for real this time"
The bottom line is that the 'set noglob' has to be in effect *before* the eval, but if the user hits ^C we don't want their shell to still have noglob set. So, we now catch the ^C and continue on like the tset completed OK. Egad.
Diffstat (limited to 'etc')
-rw-r--r--etc/root/dot.login7
1 files changed, 6 insertions, 1 deletions
diff --git a/etc/root/dot.login b/etc/root/dot.login
index 12f30e2dff5..70c76277093 100644
--- a/etc/root/dot.login
+++ b/etc/root/dot.login
@@ -1,6 +1,11 @@
set tterm='?'$TERM
-eval `set noglob ; tset -s -Q $tterm ; unset noglob`
+set noglob
+onintr finish
+eval `tset -s -Q $tterm`
+finish:
+unset noglob
unset tterm
+onintr
if ( `logname` == `whoami` ) then
echo "Don't login as root, use su"