blob: 24e816cfd74483ad79af9a1169fa75eddc6e7a8c (
plain)
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
|
diff -Naur socat-1.3/xioinitialize.c socat-1.3_patched/xioinitialize.c
--- socat-1.3/xioinitialize.c 2003-05-23 08:24:53.000000000 +0200
+++ socat-1.3_patched/xioinitialize.c 2006-09-09 18:18:19.000000000 +0200
@@ -19,48 +19,10 @@
assert(O_WRONLY==1);
assert(O_RDWR==2);
- /* some assertions about termios */
-#if WITH_TERMIOS
-#ifdef CRDLY
- assert(3 << opt_crdly.arg3 == CRDLY);
-#endif
-#ifdef TABDLY
- assert(3 << opt_tabdly.arg3 == TABDLY);
-#endif
- assert(3 << opt_csize.arg3 == CSIZE);
- {
- union {
- struct termios termarg;
- tcflag_t flags[4];
-#if HAVE_TERMIOS_ISPEED
- speed_t speeds[sizeof(struct termios)/sizeof(speed_t)];
-#endif
- } tdata;
- tdata.termarg.c_iflag = 0x12345678;
- tdata.termarg.c_oflag = 0x23456789;
- tdata.termarg.c_cflag = 0x3456789a;
- tdata.termarg.c_lflag = 0x456789ab;
- assert(tdata.termarg.c_iflag == tdata.flags[0]);
- assert(tdata.termarg.c_oflag == tdata.flags[1]);
- assert(tdata.termarg.c_cflag == tdata.flags[2]);
- assert(tdata.termarg.c_lflag == tdata.flags[3]);
-#if HAVE_TERMIOS_ISPEED
- tdata.termarg.c_ispeed = 0x56789abc;
- tdata.termarg.c_ospeed = 0x6789abcd;
- assert(tdata.termarg.c_ispeed == tdata.speeds[ISPEED_OFFSET]);
- assert(tdata.termarg.c_ospeed == tdata.speeds[OSPEED_OFFSET]);
-#endif
- }
-#endif
-
/* these dependencies required in applyopts() for OFUNC_FCNTL */
assert(F_GETFD == F_SETFD-1);
assert(F_GETFL == F_SETFL-1);
- if (Atexit(xioexit) < 0) {
- Error("atexit(xioexit) failed");
- return -1;
- }
xioinitialized = 1;
return 0;
}
|
