Add more termios constants #625

Susurrus · 2017-06-22T19:20:52Z

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

Susurrus · 2017-06-23T15:08:44Z

Tests pass and I've successfully used these constants in a downstream PR, so I think this should be RTM.

Susurrus · 2017-06-23T15:18:26Z

Nvm, missing some constants on a few platforms I think.

alexcrichton · 2017-06-23T15:28:57Z

src/unix/bsd/apple/mod.rs

-pub const TAB3: ::c_int = 0x00000004;
-pub const VT0: ::c_int  = 0x00000000;
-pub const VT1: ::c_int  = 0x00010000;
+pub const NL0: ::tcflag_t  = 0x00000000;


Unfortunately while likely more correct this is a breaking change, so it'll have to happen in a future PR.

I can file that as a separate PR for that change then. Unfortunate that breaking changes can't be done to libc even though it's < 1.0. Is there a roadmap for getting addressing these breaking changes in a reasonable timeframe?

Not currently, no.

So I've not changed the datatypes for the non-apply BSD platforms in this PR, can I keep those as tcflag_t types then and just make sure I don't touch the old ones?

Or do you want those constants to be c_int across all platforms?

nah switching to tcflag_t seems fine by me.

Susurrus · 2017-06-24T23:45:52Z

This failed CI because the Mac builds mostly timed out, but they should pass. Could someone with Travis permissions rerun the build or r+ it so homu will?

alexcrichton · 2017-06-25T05:07:46Z

@bors: r+

bors · 2017-06-25T05:07:47Z

📌 Commit 8f4de54 has been approved by alexcrichton

bors · 2017-06-25T05:49:56Z

⌛ Testing commit 8f4de54 with merge 46f98a1...

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

bors · 2017-06-25T12:49:02Z

💔 Test failed - status-travis

Susurrus · 2017-06-25T15:40:06Z

Still failing because OS X builds in Travis aren't even running. I've pushed this branch again to force a new test run, and hopefully this one passes.

alexcrichton · 2017-06-25T15:57:00Z

@bors: retry

alexcrichton · 2017-06-25T15:57:05Z

@bors: r+

bors · 2017-06-25T15:57:06Z

📌 Commit 297d5b7 has been approved by alexcrichton

bors · 2017-06-25T22:40:43Z

⌛ Testing commit 297d5b7 with merge d4a55d5...

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

bors · 2017-06-26T06:40:35Z

💔 Test failed - status-travis

Susurrus · 2017-06-26T06:55:30Z

Looks like something's wrong with the mac runners on Travis right now, and I don't know how to fix that. travis's status page doesn't indicate anything bad is going on.

alexcrichton · 2017-06-26T11:25:18Z

@bors: retry

alexcrichton · 2017-06-26T11:25:34Z

@bors: r+

bors · 2017-06-26T11:25:35Z

💡 This pull request was already approved, no need to approve it again.

This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
There's another pull request that is currently being tested, blocking this pull request: [uclibc] add more structs to x86_64 #626

bors · 2017-06-26T11:25:35Z

📌 Commit 297d5b7 has been approved by alexcrichton

bors · 2017-06-26T13:40:55Z

⌛ Testing commit 297d5b7 with merge e24f3f8...

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

bors · 2017-06-26T20:40:28Z

💔 Test failed - status-travis

alexcrichton · 2017-06-26T20:45:56Z

@bors: retry

…

On Mon, Jun 26, 2017 at 3:40 PM, bors ***@***.***> wrote: 💔 Test failed - status-travis <https://travis-ci.org/rust-lang/libc/builds/247104626?utm_source=github_status&utm_medium=notification> — You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub <#625 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAD95AhkaFk8fJYJ3pyixCyoWxMLx-dLks5sIBc9gaJpZM4OCu10> .

bors · 2017-06-26T21:55:03Z

⌛ Testing commit 297d5b7 with merge f53b95a...

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

bors · 2017-06-26T22:35:18Z

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing f53b95a to master...

Susurrus · 2017-06-26T22:50:17Z

Man, Travis was super difficult on this PR. Thanks tho for helping push this through!

Correct datatype for various termios constants This was a part of #625, but I moved it to a separate PR as it's a breaking change and those are currently blocked for Tier 1 platforms.

Susurrus force-pushed the termios_more branch 5 times, most recently from 7da6b53 to dbb9239 Compare June 23, 2017 07:43

Susurrus force-pushed the termios_more branch from dbb9239 to 2d58ed7 Compare June 23, 2017 15:25

alexcrichton reviewed Jun 23, 2017

View reviewed changes

Susurrus force-pushed the termios_more branch from 2d58ed7 to 21b8fcb Compare June 23, 2017 23:17

Susurrus added 3 commits June 24, 2017 08:56

Add more termios output flags

14a3a11

Add termios control character indices

bd7dfd1

Add termios control flags

cb53d72

Susurrus force-pushed the termios_more branch from 21b8fcb to 8f4de54 Compare June 24, 2017 15:57

Add termios local flags

297d5b7

Susurrus force-pushed the termios_more branch from 8f4de54 to 297d5b7 Compare June 25, 2017 15:39

alexcrichton closed this Jun 26, 2017

alexcrichton reopened this Jun 26, 2017

bors merged commit 297d5b7 into rust-lang:master Jun 26, 2017

bors mentioned this pull request Jun 26, 2017

Add constants for sysconf(3) and pathconf(3) #628

Merged

Susurrus deleted the termios_more branch June 26, 2017 22:50

This was referenced Jun 27, 2017

Correct datatype for various termios constants #629

Merged

Upstream and use socket constants from libc nix-rust/nix#637

Closed

Susurrus mentioned this pull request Jul 6, 2017

merge socket constants nix-rust/nix#647

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add more termios constants #625

Add more termios constants #625

Susurrus commented Jun 22, 2017

Susurrus commented Jun 23, 2017

Susurrus commented Jun 23, 2017

alexcrichton Jun 23, 2017

Susurrus Jun 23, 2017

alexcrichton Jun 23, 2017

Susurrus Jun 23, 2017

Susurrus Jun 23, 2017

alexcrichton Jun 23, 2017

Susurrus commented Jun 24, 2017

alexcrichton commented Jun 25, 2017

bors commented Jun 25, 2017

bors commented Jun 25, 2017

bors commented Jun 25, 2017

Susurrus commented Jun 25, 2017

alexcrichton commented Jun 25, 2017

alexcrichton commented Jun 25, 2017

bors commented Jun 25, 2017

bors commented Jun 25, 2017

bors commented Jun 26, 2017

Susurrus commented Jun 26, 2017

alexcrichton commented Jun 26, 2017

alexcrichton commented Jun 26, 2017

bors commented Jun 26, 2017

bors commented Jun 26, 2017

bors commented Jun 26, 2017

bors commented Jun 26, 2017

alexcrichton commented Jun 26, 2017 via email

bors commented Jun 26, 2017

bors commented Jun 26, 2017

Susurrus commented Jun 26, 2017

Add more termios constants #625

Add more termios constants #625

Conversation

Susurrus commented Jun 22, 2017

References:

Susurrus commented Jun 23, 2017

Susurrus commented Jun 23, 2017

alexcrichton Jun 23, 2017

Choose a reason for hiding this comment

Susurrus Jun 23, 2017

Choose a reason for hiding this comment

alexcrichton Jun 23, 2017

Choose a reason for hiding this comment

Susurrus Jun 23, 2017

Choose a reason for hiding this comment

Susurrus Jun 23, 2017

Choose a reason for hiding this comment

alexcrichton Jun 23, 2017

Choose a reason for hiding this comment

Susurrus commented Jun 24, 2017

alexcrichton commented Jun 25, 2017

bors commented Jun 25, 2017

bors commented Jun 25, 2017

bors commented Jun 25, 2017

Susurrus commented Jun 25, 2017

alexcrichton commented Jun 25, 2017

alexcrichton commented Jun 25, 2017

bors commented Jun 25, 2017

bors commented Jun 25, 2017

bors commented Jun 26, 2017

Susurrus commented Jun 26, 2017

alexcrichton commented Jun 26, 2017

alexcrichton commented Jun 26, 2017

bors commented Jun 26, 2017

bors commented Jun 26, 2017

bors commented Jun 26, 2017

bors commented Jun 26, 2017

alexcrichton commented Jun 26, 2017 via email

bors commented Jun 26, 2017

bors commented Jun 26, 2017

Susurrus commented Jun 26, 2017