summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1996-12-30 09:01:50 +0000
committerjkh <jkh@FreeBSD.org>1996-12-30 09:01:50 +0000
commita334cda535df85811d3c6c2d4b43952c1653cfc8 (patch)
tree2386bb8e2d47baf1095b061afdfa91d832aae730
parentc6b8ce4f9011b646d2da9b93278ee9b9b5d7afa2 (diff)
downloadFreeBSD-src-a334cda535df85811d3c6c2d4b43952c1653cfc8.zip
FreeBSD-src-a334cda535df85811d3c6c2d4b43952c1653cfc8.tar.gz
Remove breakage of 1.8.2.2, choose slightly better character for quit.
-rw-r--r--usr.sbin/watch/watch.82
-rw-r--r--usr.sbin/watch/watch.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8
index a3f095c..bf8f0da 100644
--- a/usr.sbin/watch/watch.8
+++ b/usr.sbin/watch/watch.8
@@ -61,7 +61,7 @@ Names may be preceded by "/dev/".
While running in interactive mode, all user input is discarded except for:
.Pp
.Bl -tag -width "XXXX" -compact
-.It Sy "<control-Q>"
+.It Sy "<control-G>"
Exit
.Nm watch .
.It Sy "<control-W>"
diff --git a/usr.sbin/watch/watch.c b/usr.sbin/watch/watch.c
index 50094e7..f544c0e 100644
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@@ -96,11 +96,11 @@ set_tty()
ioctl(std_in, TIOCGETC, &tco);
sgn = sgo;
tc = tco;
- sgn.sg_flags |= RAW;
+ sgn.sg_flags |= CBREAK;
sgn.sg_flags &= ~ECHO;
ospeed = sgo.sg_ospeed;
- tc.t_intrc = 17; /* ^Q */
- tc.t_quitc = 17; /* ^Q */
+ tc.t_intrc = 07; /* ^G */
+ tc.t_quitc = 07; /* ^G */
ioctl(std_in, TIOCSETP, &sgn);
ioctl(std_in, TIOCSETC, &tc);
}
OpenPOWER on IntegriCloud