Skip to content

Commit f53b95a

Browse files
borsbors
committed
Auto merge of #625 - Susurrus:termios_more, r=alexcrichton
Add more termios constants Went through and found some more termios constants that were missing and added them. I skipped some platforms (solaris, uclibc) and assumed Android has the same constants are Linux, as I couldn't find a good reference for what Android exposes, but it generally follows linux, so I assumed the same was true for some of those values. ## References: FreeBSD: * https://github.com/freebsd/freebsd/blob/d39171bb1f2256bd3bf018314aec600f79b89bc6/sys/sys/_termios.h * https://github.com/freebsd/freebsd/blob/d39171bb1f2256bd3bf018314aec600f79b89bc6/include/termios.h NetBSD: https://github.com/NetBSD/src/blob/0bff031265b50be8e8b7719aed82212928d6c1df/sys/sys/termios.h musl: /usr/x86_64-linux-musl/include/bits/termios.h (identical to Linux-x86_64) linux: /usr/include/bits/termios.h OpenBSD: https://github.com/openbsd/src/blob/5271000b44abe23907b73bbb3aa38ddf4a0bce08/sys/sys/termios.h DragonFlyBSD: * https://github.com/DragonFlyBSD/DragonFlyBSD/blob/ddad68003a1b070d6955ae737c834cd3267d3ead/sys/sys/_termios.h * https://github.com/DragonFlyBSD/DragonFlyBSD/blob/ddad68003a1b070d6955ae737c834cd3267d3ead/sys/sys/termios.h Android: Just use the same as Linux uclibc: skipped haiku-os: http://cgit.haiku-os.org/haiku/tree/headers/posix/termios.h mac: /usr/include/sys/termios.h and /usr/include/sys/_types/_posix_vdisable.h solaris: skipped bitrig (follows openbsd): https://github.com/bitrig/bitrig/blob/d31f5220a98fae4e74abafe27c8d150843cc8105/sys/sys/termios.h
2 parents 46f71e2 + 297d5b7 commit f53b95a

File tree

22 files changed

+218
-2
lines changed

22 files changed

+218
-2
lines changed

‎src/unix/bsd/freebsdlike/dragonfly/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,8 @@ pub const AT_REMOVEDIR: ::c_int = 2;
412412
pub const AT_EACCESS: ::c_int = 4;
413413
pub const AT_SYMLINK_FOLLOW: ::c_int = 8;
414414

415+
pub const VCHECKPT: usize = 19;
416+
415417
extern {
416418
pub fn mprotect(addr: *mut ::c_void, len: ::size_t, prot: ::c_int)
417419
-> ::c_int;

‎src/unix/bsd/freebsdlike/freebsd/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,10 @@ pub const AT_SYMLINK_NOFOLLOW: ::c_int = 0x200;
517517
pub const AT_SYMLINK_FOLLOW: ::c_int = 0x400;
518518
pub const AT_REMOVEDIR: ::c_int = 0x800;
519519

520+
pub const TABDLY: ::tcflag_t = 0x00000004;
521+
pub const TAB0: ::tcflag_t = 0x00000000;
522+
pub const TAB3: ::tcflag_t = 0x00000004;
523+
520524
extern {
521525
pub fn __error() -> *mut ::c_int;
522526

‎src/unix/bsd/freebsdlike/mod.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -861,6 +861,15 @@ pub const EXTB: speed_t = 38400;
861861
pub const SEM_FAILED: *mut sem_t = 0 as *mut sem_t;
862862

863863
pub const CRTSCTS: ::tcflag_t = 0x00030000;
864+
pub const CCTS_OFLOW: ::tcflag_t = 0x00010000;
865+
pub const CRTS_IFLOW: ::tcflag_t = 0x00020000;
866+
pub const CDTR_IFLOW: ::tcflag_t = 0x00040000;
867+
pub const CDSR_OFLOW: ::tcflag_t = 0x00080000;
868+
pub const CCAR_OFLOW: ::tcflag_t = 0x00100000;
869+
pub const VERASE2: usize = 7;
870+
pub const OCRNL: ::tcflag_t = 0x10;
871+
pub const ONOCR: ::tcflag_t = 0x20;
872+
pub const ONLRET: ::tcflag_t = 0x40;
864873

865874
f! {
866875
pub fn WIFCONTINUED(status: ::c_int) -> bool {

‎src/unix/bsd/mod.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,15 @@ pub const VREPRINT: usize = 6;
233233
pub const VINTR: usize = 8;
234234
pub const VQUIT: usize = 9;
235235
pub const VSUSP: usize = 10;
236+
pub const VDSUSP: usize = 11;
236237
pub const VSTART: usize = 12;
237238
pub const VSTOP: usize = 13;
238239
pub const VLNEXT: usize = 14;
239240
pub const VDISCARD: usize = 15;
240241
pub const VMIN: usize = 16;
241242
pub const VTIME: usize = 17;
243+
pub const VSTATUS: usize = 18;
244+
pub const _POSIX_VDISABLE: ::cc_t = 0xff;
242245
pub const IGNBRK: ::tcflag_t = 0x00000001;
243246
pub const BRKINT: ::tcflag_t = 0x00000002;
244247
pub const IGNPAR: ::tcflag_t = 0x00000004;
@@ -256,6 +259,7 @@ pub const OPOST: ::tcflag_t = 0x1;
256259
pub const ONLCR: ::tcflag_t = 0x2;
257260
pub const OXTABS: ::tcflag_t = 0x4;
258261
pub const ONOEOT: ::tcflag_t = 0x8;
262+
pub const CIGNORE: ::tcflag_t = 0x00000001;
259263
pub const CSIZE: ::tcflag_t = 0x00000300;
260264
pub const CS5: ::tcflag_t = 0x00000000;
261265
pub const CS6: ::tcflag_t = 0x00000100;
@@ -276,12 +280,15 @@ pub const ECHOPRT: ::tcflag_t = 0x00000020;
276280
pub const ECHOCTL: ::tcflag_t = 0x00000040;
277281
pub const ISIG: ::tcflag_t = 0x00000080;
278282
pub const ICANON: ::tcflag_t = 0x00000100;
283+
pub const ALTWERASE: ::tcflag_t = 0x00000200;
279284
pub const IEXTEN: ::tcflag_t = 0x00000400;
280285
pub const EXTPROC: ::tcflag_t = 0x00000800;
281286
pub const TOSTOP: ::tcflag_t = 0x00400000;
282287
pub const FLUSHO: ::tcflag_t = 0x00800000;
288+
pub const NOKERNINFO: ::tcflag_t = 0x02000000;
283289
pub const PENDIN: ::tcflag_t = 0x20000000;
284290
pub const NOFLSH: ::tcflag_t = 0x80000000;
291+
pub const MDMBUF: ::tcflag_t = 0x00100000;
285292

286293
pub const WNOHANG: ::c_int = 0x00000001;
287294
pub const WUNTRACED: ::c_int = 0x00000002;

‎src/unix/bsd/netbsdlike/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,11 @@ pub const EXTB: speed_t = 38400;
538538

539539
pub const SEM_FAILED: *mut sem_t = 0 as *mut sem_t;
540540

541+
pub const CRTSCTS: ::tcflag_t = 0x00010000;
542+
pub const CRTS_IFLOW: ::tcflag_t = CRTSCTS;
543+
pub const CCTS_OFLOW: ::tcflag_t = CRTSCTS;
544+
pub const OCRNL: ::tcflag_t = 0x10;
545+
541546
f! {
542547
pub fn WSTOPSIG(status: ::c_int) -> ::c_int {
543548
status >> 8

‎src/unix/bsd/netbsdlike/netbsd/mod.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,6 @@ pub const NOTE_TRACK: ::uint32_t = 0x00000001;
463463
pub const NOTE_TRACKERR: ::uint32_t = 0x00000002;
464464
pub const NOTE_CHILD: ::uint32_t = 0x00000004;
465465

466-
pub const CRTSCTS: ::tcflag_t = 0x00010000;
467-
468466
pub const TMP_MAX : ::c_uint = 308915776;
469467

470468
pub const NI_MAXHOST: ::socklen_t = 1025;
@@ -644,6 +642,11 @@ pub const P_PGID: idtype_t = 4;
644642
pub const B460800: ::speed_t = 460800;
645643
pub const B921600: ::speed_t = 921600;
646644

645+
pub const ONOCR: ::tcflag_t = 0x20;
646+
pub const ONLRET: ::tcflag_t = 0x40;
647+
pub const CDTRCTS: ::tcflag_t = 0x00020000;
648+
pub const CHWFLOW: ::tcflag_t = ::MDMBUF | ::CRTSCTS | ::CDTRCTS;
649+
647650
// dirfd() is a macro on netbsd to access
648651
// the first field of the struct where dirp points to:
649652
// http://cvsweb.netbsd.org/bsdweb.cgi/src/include/dirent.h?rev=1.36

‎src/unix/bsd/netbsdlike/openbsdlike/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,11 @@ pub const KI_WMESGLEN: ::c_int = 8;
460460
pub const KI_MAXLOGNAME: ::c_int = 32;
461461
pub const KI_EMULNAMELEN: ::c_int = 8;
462462

463+
pub const CHWFLOW: ::tcflag_t = ::MDMBUF | ::CRTSCTS;
464+
pub const OLCUC: ::tcflag_t = 0x20;
465+
pub const ONOCR: ::tcflag_t = 0x40;
466+
pub const ONLRET: ::tcflag_t = 0x80;
467+
463468
extern {
464469
pub fn dirfd(dirp: *mut ::DIR) -> ::c_int;
465470
pub fn getnameinfo(sa: *const ::sockaddr,

‎src/unix/haiku/mod.rs

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,48 @@ pub const P_ALL: idtype_t = 0;
686686
pub const P_PID: idtype_t = 1;
687687
pub const P_PGID: idtype_t = 2;
688688

689+
pub const VINTR: usize = 0;
690+
pub const VQUIT: usize = 1;
691+
pub const VERASE: usize = 2;
692+
pub const VKILL: usize = 3;
693+
pub const VEOF: usize = 4;
694+
pub const VEOL: usize = 5;
695+
pub const VMIN: usize = 4;
696+
pub const VTIME: usize = 5;
697+
pub const VEOL2: usize = 6;
698+
pub const VSWTCH: usize = 7;
699+
pub const VSTART: usize = 8;
700+
pub const VSTOP: usize = 9;
701+
pub const VSUSP: usize = 10;
702+
pub const OLCUC: ::tcflag_t = 0o000002;
703+
pub const OCRNL: ::tcflag_t = 0o000010;
704+
pub const ONOCR: ::tcflag_t = 0o000020;
705+
pub const ONLRET: ::tcflag_t = 0o000040;
706+
pub const OFILL: ::tcflag_t = 0o000100;
707+
pub const OFDEL: ::tcflag_t = 0o000200;
708+
pub const NLDLY: ::tcflag_t = 0o000400;
709+
pub const NL0: ::tcflag_t = 0o000000;
710+
pub const NL1: ::tcflag_t = 0o000400;
711+
pub const CRDLY: ::tcflag_t = 0o003000;
712+
pub const CR0: ::tcflag_t = 0o000000;
713+
pub const CR1: ::tcflag_t = 0o001000;
714+
pub const CR2: ::tcflag_t = 0o002000;
715+
pub const CR3: ::tcflag_t = 0o003000;
716+
pub const TABDLY: ::tcflag_t = 0o014000;
717+
pub const TAB0: ::tcflag_t = 0o000000;
718+
pub const TAB1: ::tcflag_t = 0o004000;
719+
pub const TAB2: ::tcflag_t = 0o010000;
720+
pub const TAB3: ::tcflag_t = 0o014000;
721+
pub const BSDLY: ::tcflag_t = 0o020000;
722+
pub const BS0: ::tcflag_t = 0o000000;
723+
pub const BS1: ::tcflag_t = 0o020000;
724+
pub const FFDLY: ::tcflag_t = 0o100000;
725+
pub const FF0: ::tcflag_t = 0o000000;
726+
pub const FF1: ::tcflag_t = 0o100000;
727+
pub const VTDLY: ::tcflag_t = 0o040000;
728+
pub const VT0: ::tcflag_t = 0o000000;
729+
pub const VT1: ::tcflag_t = 0o040000;
730+
689731
f! {
690732
pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () {
691733
let fd = fd as usize;

‎src/unix/notbsd/android/mod.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,15 @@ pub const ISIG: ::tcflag_t = 0x00000001;
627627
pub const ICANON: ::tcflag_t = 0x00000002;
628628
pub const PENDIN: ::tcflag_t = 0x00004000;
629629
pub const NOFLSH: ::tcflag_t = 0x00000080;
630+
pub const VSWTC: usize = 7;
631+
pub const OLCUC: ::tcflag_t = 0o000002;
632+
pub const NLDLY: ::tcflag_t = 0o000400;
633+
pub const CRDLY: ::tcflag_t = 0o003000;
634+
pub const TABDLY: ::tcflag_t = 0o014000;
635+
pub const BSDLY: ::tcflag_t = 0o020000;
636+
pub const FFDLY: ::tcflag_t = 0o100000;
637+
pub const VTDLY: ::tcflag_t = 0o040000;
638+
pub const XTABS: ::tcflag_t = 0o014000;
630639

631640
pub const B0: ::speed_t = 0o000000;
632641
pub const B50: ::speed_t = 0o000001;
@@ -725,6 +734,10 @@ pub const NLA_TYPE_MASK: ::c_int = !(NLA_F_NESTED | NLA_F_NET_BYTEORDER);
725734

726735
pub const SIGEV_THREAD_ID: ::c_int = 4;
727736

737+
pub const CMSPAR: ::tcflag_t = 0o10000000000;
738+
pub const CIBAUD: ::tcflag_t = 0o02003600000;
739+
pub const CBAUDEX: ::tcflag_t = 0o010000;
740+
728741
f! {
729742
pub fn CPU_ZERO(cpuset: &mut cpu_set_t) -> () {
730743
for slot in cpuset.__bits.iter_mut() {

‎src/unix/notbsd/linux/mips/mod.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,17 @@ pub const ISIG: ::tcflag_t = 0x00000001;
490490
pub const ICANON: ::tcflag_t = 0x00000002;
491491
pub const PENDIN: ::tcflag_t = 0x00004000;
492492
pub const NOFLSH: ::tcflag_t = 0x00000080;
493+
pub const CIBAUD: ::tcflag_t = 0o02003600000;
494+
pub const CBAUDEX: ::tcflag_t = 0o010000;
495+
pub const VSWTC: usize = 7;
496+
pub const OLCUC: ::tcflag_t = 0o000002;
497+
pub const NLDLY: ::tcflag_t = 0o000400;
498+
pub const CRDLY: ::tcflag_t = 0o003000;
499+
pub const TABDLY: ::tcflag_t = 0o014000;
500+
pub const BSDLY: ::tcflag_t = 0o020000;
501+
pub const FFDLY: ::tcflag_t = 0o100000;
502+
pub const VTDLY: ::tcflag_t = 0o040000;
503+
pub const XTABS: ::tcflag_t = 0o014000;
493504

494505
pub const B0: ::speed_t = 0o000000;
495506
pub const B50: ::speed_t = 0o000001;

0 commit comments

Comments
 (0)