1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
From 376a1532c0b82de1df8b0f7899c4e204eb812ef3 Mon Sep 17 00:00:00 2001
From: James A Morrison <ja2morri@student.math.uwaterloo.ca>
Date: Sun, 29 Jul 2001 01:51:53 -0400
Subject: make purity build on SYSV platforms using termios
This patch updates purity to use termios on systems which are build
with sysv defined. Updating purity to termios allows purity to run on
GNU/Linux and GNU/HURD equally well. This patch is needed to compile
purity on GNU HURD.
Bug-Debian: http://bugs.debian.org/106962
---
pt.c | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/pt.c b/pt.c
index 8a49204..a8730f7 100644
--- a/pt.c
+++ b/pt.c
@@ -20,17 +20,13 @@
#ifdef SYSV
#include <sys/types.h>
#include <sys/stat.h>
-#ifdef LINUX
-# include <termios.h>
-#else
-# include <sys/termio.h>
-#endif
+#include <termios.h> /* SYSV now uses termios instead of termio POSIX compliant */
#include <string.h>
#else
-#include <sys/ioctl.h>
#include <sgtty.h>
#include <strings.h>
-#endif
+#endif /*SYSV*/
+#include <sys/ioctl.h>
#include <sys/file.h>
#include <signal.h>
#include <pwd.h>
@@ -659,7 +655,7 @@ void set_mode()
#ifndef SYSV
struct sgttyb p;
#else
- struct termio p;
+ struct termios p;
#endif
#ifndef SYSV
@@ -669,13 +665,13 @@ void set_mode()
p.sg_flags &= ~ECHO;
(void) ioctl(0,TIOCSETP,&p);
#else
- (void) ioctl(0,TCGETA,&p);
+ tcgetattr(0,&p);
tty_flags = p.c_lflag;
baz = p.c_cc[VMIN];
p.c_lflag &= ~ICANON;
p.c_lflag &= ~ECHO;
p.c_cc[VMIN] = 1;
- (void) ioctl(0,TCSETA,&p);
+ tcsetattr(0,TCSANOW,&p);
#endif
}
@@ -684,7 +680,7 @@ void clr_mode()
#ifndef SYSV
struct sgttyb p;
#else
- struct termio p;
+ struct termios p;
#endif
#ifndef SYSV
@@ -692,10 +688,10 @@ void clr_mode()
p.sg_flags = tty_flags;
(void) ioctl(0,TIOCSETP,&p);
#else
- (void) ioctl(0,TCGETA,&p);
+ tcgetattr(0,&p);
p.c_lflag = tty_flags;
p.c_cc[VMIN] = baz;
- (void) ioctl(0,TCSETA,&p);
+ tcsetattr(0,TCSANOW,&p);
#endif
}
@@ -793,7 +789,7 @@ void sizewindow()
{
struct winsize wsize;
- (void) ioctl(0,TIOCGWINSZ,&wsize);
+ (void) ioctl(0,TIOCSWINSZ,&wsize);
cols = wsize.ws_col;
rows = wsize.ws_row;
|
