summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Andersen2000-03-19 05:13:49 +0000
committerErik Andersen2000-03-19 05:13:49 +0000
commit6c41c448982827ef5bfac9bac14bc9e509f45bc4 (patch)
tree6f022d62f6b2a83561c877de0df6b97916c04bb6
parent531bcb6826e414f08a74d0a0c1b3ca91acfec74a (diff)
downloadbusybox-6c41c448982827ef5bfac9bac14bc9e509f45bc4.zip
busybox-6c41c448982827ef5bfac9bac14bc9e509f45bc4.tar.gz
Adjust the termio settings, and don't use octal since it
is impossible to read by mere mortals. -Erik
-rw-r--r--init.c18
-rw-r--r--init/init.c18
2 files changed, 20 insertions, 16 deletions
diff --git a/init.c b/init.c
index c6052f8..f0124a2 100644
--- a/init.c
+++ b/init.c
@@ -191,23 +191,25 @@ void message(int device, char *fmt, ...)
void set_term(int fd)
{
struct termios tty;
- static const char control_characters[] = {
- '\003', '\034', '\177', '\025', '\004', '\0',
- '\1', '\0', '\021', '\023', '\032', '\0', '\022',
- '\017', '\027', '\026', '\0'
- };
tcgetattr(fd, &tty);
/* set control chars */
- memcpy(tty.c_cc, control_characters, sizeof(control_characters));
+ tty.c_cc[VINTR] = 3; /* C-c */
+ tty.c_cc[VQUIT] = 28; /* C-\ */
+ tty.c_cc[VERASE] = 127; /* C-? */
+ tty.c_cc[VKILL] = 21; /* C-u */
+ tty.c_cc[VEOF] = 4; /* C-d */
+ tty.c_cc[VSTART] = 17; /* C-q */
+ tty.c_cc[VSTOP] = 19; /* C-s */
+ tty.c_cc[VSUSP] = 26; /* C-z */
/* use line dicipline 0 */
tty.c_line = 0;
/* Make it be sane */
- //tty.c_cflag &= CBAUD|CBAUDEX|CSIZE|CSTOPB|PARENB|PARODD;
- //tty.c_cflag |= HUPCL|CLOCAL;
+ tty.c_cflag &= CBAUD|CBAUDEX|CSIZE|CSTOPB|PARENB|PARODD;
+ tty.c_cflag |= HUPCL|CLOCAL;
/* input modes */
tty.c_iflag = ICRNL | IXON | IXOFF;
diff --git a/init/init.c b/init/init.c
index c6052f8..f0124a2 100644
--- a/init/init.c
+++ b/init/init.c
@@ -191,23 +191,25 @@ void message(int device, char *fmt, ...)
void set_term(int fd)
{
struct termios tty;
- static const char control_characters[] = {
- '\003', '\034', '\177', '\025', '\004', '\0',
- '\1', '\0', '\021', '\023', '\032', '\0', '\022',
- '\017', '\027', '\026', '\0'
- };
tcgetattr(fd, &tty);
/* set control chars */
- memcpy(tty.c_cc, control_characters, sizeof(control_characters));
+ tty.c_cc[VINTR] = 3; /* C-c */
+ tty.c_cc[VQUIT] = 28; /* C-\ */
+ tty.c_cc[VERASE] = 127; /* C-? */
+ tty.c_cc[VKILL] = 21; /* C-u */
+ tty.c_cc[VEOF] = 4; /* C-d */
+ tty.c_cc[VSTART] = 17; /* C-q */
+ tty.c_cc[VSTOP] = 19; /* C-s */
+ tty.c_cc[VSUSP] = 26; /* C-z */
/* use line dicipline 0 */
tty.c_line = 0;
/* Make it be sane */
- //tty.c_cflag &= CBAUD|CBAUDEX|CSIZE|CSTOPB|PARENB|PARODD;
- //tty.c_cflag |= HUPCL|CLOCAL;
+ tty.c_cflag &= CBAUD|CBAUDEX|CSIZE|CSTOPB|PARENB|PARODD;
+ tty.c_cflag |= HUPCL|CLOCAL;
/* input modes */
tty.c_iflag = ICRNL | IXON | IXOFF;