--===============1849954035==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
New submission from Ulrich Spoerlein <uqs@spoerlein.net>:
This gets rid of sgtty calls in larn(6), courtesy of FreeBSD ports
I also cleaned up some unnecessary BSD and SYSV defines as well as NOVARARG=
S=20
and unrolled the obfuscated doraw/unraw macros.
----------
files: larn.diff
messages: 7326
nosy: uqs
priority: cleanup
status: unread
title: games/larn: replace sgtty with termios
_____________________________________________________
DragonFly issue tracker <bugs@lists.dragonflybsd.org>
<http://bugs.dragonflybsd.org/issue1492>
_____________________________________________________
--===============1849954035==
Content-Type: application/octet-stream
MIME-Version: 1.0
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
filename="larn.diff"
Y29tbWl0IDdlY2ZlYmE4ZThiZjQ5NWIxNmUxZWE2MTI2NzQ2ODBkN2M4MzQ2YjQNCkF1dGhvcjog
VWxyaWNoIFNww7ZybGVpbiA8dXFzQHNwb2VybGVpbi5uZXQ+DQpEYXRlOiAgIFR1ZSBTZXAgOCAy
MDowNDowNyAyMDA5ICswMjAwDQoNCiAgICBnYW1lcy9sYXJuOiByZXBsYWNlIHNndHR5IHdpdGgg
dGVybWlvcw0KICAgIA0KICAgIGFuZCBnZXQgcmlkIG9mIHNvbWUgdW5uZWNlc3NhcnkgQlNEIG9y
IFNZUyBWNyBkZWZpbmVzDQoNCmRpZmYgLS1naXQgYS9nYW1lcy9sYXJuL01ha2VmaWxlIGIvZ2Ft
ZXMvbGFybi9NYWtlZmlsZQ0KaW5kZXggMGM4ZTQxMy4uY2I3MDhjNyAxMDA2NDQNCi0tLSBhL2dh
bWVzL2xhcm4vTWFrZWZpbGUNCisrKyBiL2dhbWVzL2xhcm4vTWFrZWZpbGUNCkBAIC00LDEzICs0
LDYgQEANCiANCiAjIEVYVFJBDQogIwlJbmNvcnBvcmF0ZXMgY29kZSB0byBnYXRoZXIgYWRkaXRp
b25hbCBwZXJmb3JtYW5jZSBzdGF0aXN0aWNzDQotIyBTWVNWDQotIwlVc2Ugc3lzdGVtIElJSS9W
IChpbnN0ZWFkIG9mIFY3KSB0eXBlIGlvY3RsIGNhbGxzDQotIyBCU0QNCi0jCVVzZSBCU0Qgc3Bl
Y2lmaWMgZmVhdHVyZXMgKG1vc3RseSB0aW1lciBhbmQgc2lnbmFsIHN0dWZmKQ0KLSMgQlNENC4x
DQotIwlVc2UgQlNENC4xIHRvIGF2b2lkIHNvbWUgNC4yIGRlcGVuZGVuY2llcyAobXVzdCBiZSB1
c2VkIHdpdGgNCi0jCUJTRCBhYm92ZTsgZG8gbm90IG1peCB3aXRoIFNZU1YpDQogIyBISURFQllM
SU5LDQogIwlJZiBkZWZpbmVkLCB0aGUgcHJvZ3JhbSBhdHRlbXB0cyB0byBoaWRlIGZyb20gcHMN
CiAjIERPQ0hFQ0tQT0lOVFMNCkBAIC0yNyw5ICsyMCw2IEBADQogIwlUaGlzIGlzIHRoZSByZXZp
c2lvbiBvZiB0aGUgc29mdHdhcmUsIGV4YW1wbGU6ICAxDQogIyBGTFVTSE5PPSMNCiAjCVNldCB0
aGUgaW5wdXQgcXVldWUgZXhjZXNzIGZsdXNoaW5nIHRocmVzaG9sZCAoZGVmYXVsdCA1KQ0KLSMg
Tk9WQVJBUkdTDQotIwlEZWZpbmUgZm9yIHN5c3RlbXMgdGhhdCBkb24ndCBoYXZlIHZhcmFyZ3Mg
KGEgZGVmYXVsdCB2YXJhcmdzIHdpbGwNCi0jCWJlIHVzZWQpLg0KICMgTUFDUk9STkQNCiAjCURl
ZmluZSB0byB1c2UgbWFjcm8gdmVyc2lvbiBvZiBybmQoKSBhbmQgcnVuZCgpIChmYXN0IGFuZCBi
aWcpDQogIyBVSURTQ09SRQ0KQEAgLTU1LDcgKzQ1LDcgQEANCiANCiBQUk9HPQlsYXJuDQogTUFO
PQlsYXJuLjYNCi1DRkxBR1MrPS1EQlNEIC1EVkVSPTEyIC1EU1VCVkVSPTAgLUROT05BUCAtRFVJ
RFNDT1JFDQorQ0ZMQUdTKz0tRFZFUj0xMiAtRFNVQlZFUj0wIC1ETk9OQVAgLURVSURTQ09SRQ0K
IFNSQ1M9CW1haW4uYyBvYmplY3QuYyBjcmVhdGUuYyB0b2suYyBkaXNwbGF5LmMgZ2xvYmFsLmMg
ZGF0YS5jIGlvLmMgXA0KIAltb25zdGVyLmMgc3RvcmUuYyBkaWFnLmMgaGVscC5jIGNvbmZpZy5j
IG5hcC5jIGJpbGwuYyBzY29yZXMuYyBcDQogCXNpZ25hbC5jIG1vcmVvYmouYyBtb3ZlbS5jIHJl
Z2VuLmMgZm9ydHVuZS5jIHNhdmVsZXYuYw0KZGlmZiAtLWdpdCBhL2dhbWVzL2xhcm4vaW8uYyBi
L2dhbWVzL2xhcm4vaW8uYw0KaW5kZXggNDU3Y2E1Mi4uYjM3ODNkNCAxMDA2NDQNCi0tLSBhL2dh
bWVzL2xhcm4vaW8uYw0KKysrIGIvZ2FtZXMvbGFybi9pby5jDQpAQCAtNTcsNDYgKzU3LDE3IEBA
DQogICogTm90ZTogKiogZW50cmllcyBhcmUgYXZhaWxhYmxlIG9ubHkgaW4gdGVybWNhcCBtb2Rl
Lg0KICAqLw0KIA0KKyNpbmNsdWRlIDxzdGRhcmcuaD4NCisjaW5jbHVkZSA8dGVybWlvcy5oPg0K
ICNpbmNsdWRlICJoZWFkZXIuaCINCiANCi0jaWZkZWYgU1lTVgkvKiBzeXN0ZW0gSUlJIG9yIHN5
c3RlbSBWICovDQotI2luY2x1ZGUgPHRlcm1pby5oPg0KLSNkZWZpbmUgc2d0dHliIHRlcm1pbw0K
LSNkZWZpbmUgc3R0eShfYSxfYikgaW9jdGwoX2EsVENTRVRBLF9iKQ0KLSNkZWZpbmUgZ3R0eShf
YSxfYikgaW9jdGwoX2EsVENHRVRBLF9iKQ0KIHN0YXRpYyBpbnQgcmF3ZmxnID0gMDsNCiBzdGF0
aWMgY2hhciBzYXZlZW9mLHNhdmVlb2w7DQotI2RlZmluZSBkb3JhdyhfYSkgaWYoIXJhd2ZsZyl7
KytyYXdmbGc7c2F2ZWVvZj1fYS5jX2NjW1ZNSU5dO3NhdmVlb2w9X2EuY19jY1tWVElNRV07fVwN
Ci0gICAgX2EuY19jY1tWTUlOXT0xO19hLmNfY2NbVlRJTUVdPTE7X2EuY19sZmxhZyAmPSB+KElD
QU5PTnxFQ0hPfEVDSE9FfEVDSE9LfEVDSE9OTCkNCi0jZGVmaW5lIHVucmF3KF9hKSBfYS5jX2Nj
W1ZNSU5dPXNhdmVlb2Y7X2EuY19jY1tWVElNRV09c2F2ZWVvbDtfYS5jX2xmbGFnIHw9IElDQU5P
TnxFQ0hPfEVDSE9FfEVDSE9LfEVDSE9OTA0KLQ0KLSNlbHNlIC8qIG5vdCBTWVNWICovDQotDQot
I2lmbmRlZiBCU0QNCi0jZGVmaW5lIENCUkVBSyBSQVcJCS8qIFY3IGhhcyBubyBDQlJFQUsgKi8N
Ci0jZW5kaWYNCi0NCi0jZGVmaW5lIGRvcmF3KF9hKSAoX2Euc2dfZmxhZ3MgfD0gQ0JSRUFLLF9h
LnNnX2ZsYWdzICY9IH5FQ0hPKQ0KLSNkZWZpbmUgdW5yYXcoX2EpIChfYS5zZ19mbGFncyAmPSB+
Q0JSRUFLLF9hLnNnX2ZsYWdzIHw9IEVDSE8pDQotI2luY2x1ZGUgPHNndHR5Lmg+DQotI2RlZmlu
ZSBzdHR5KF9hLF9iKSBpb2N0bChfYSxUSU9DU0VUUCxfYikNCi0jZGVmaW5lIGd0dHkoX2EsX2Ip
IGlvY3RsKF9hLFRJT0NHRVRQLF9iKQ0KLSNlbmRpZiAvKiBub3QgU1lTViAqLw0KLQ0KLSNpZm5k
ZWYgTk9WQVJBUkdTCS8qIGlmIHdlIGhhdmUgdmFyYXJncyAqLw0KLSNpbmNsdWRlIDxzdGRhcmcu
aD4NCi0jZWxzZSAvKiBOT1ZBUkFSR1MgKi8JLyogaWYgd2UgZG9uJ3QgaGF2ZSB2YXJhcmdzICov
DQotdHlwZWRlZiBjaGFyICp2YV9saXN0Ow0KLSNkZWZpbmUgdmFfZGNsIGludCB2YV9hbGlzdDsN
Ci0jZGVmaW5lIHZhX3N0YXJ0KHBsaXN0KSBwbGlzdCA9IChjaGFyICopICZ2YV9hbGlzdA0KLSNk
ZWZpbmUgdmFfZW5kKHBsaXN0KQ0KLSNkZWZpbmUgdmFfYXJnKHBsaXN0LG1vZGUpICgobW9kZSAq
KShwbGlzdCArPSBzaXplb2YobW9kZSkpKVstMV0NCi0jZW5kaWYgLyogTk9WQVJBUkdTICovDQog
DQogI2RlZmluZSBMSU5CVUZTSVpFIDEyOAkJLyogc2l6ZSBvZiB0aGUgbGdldHcoKSBhbmQgbGdl
dGwoKSBidWZmZXIJCSovDQogaW50IGxmZDsJCQkJCS8qICBvdXRwdXQgZmlsZSBudW1iZXJzCQkJ
CQkJCSovDQogaW50IGZkOwkJCQkJCS8qICBpbnB1dCBmaWxlIG51bWJlcnMJCQkJCQkJKi8NCi1z
dGF0aWMgc3RydWN0IHNndHR5YiB0dHg7CS8qIHN0b3JhZ2UgZm9yIHRoZSB0dHkgbW9kZXMJCQkJ
CSovDQorc3RhdGljIHN0cnVjdCB0ZXJtaW9zIHR0eDsJLyogc3RvcmFnZSBmb3IgdGhlIHR0eSBt
b2RlcwkJCQkJKi8NCiBzdGF0aWMgaW50IGlwb2ludD1NQVhJQlVGLGllcG9pbnQ9TUFYSUJVRjsJ
LyogIGlucHV0IGJ1ZmZlcmluZyBwb2ludGVycyAgICAqLw0KIHN0YXRpYyBjaGFyIGxnZXR3YnVm
W0xJTkJVRlNJWkVdOwkvKiBnZXQgbGluZSAod29yZCkgYnVmZmVyCQkJCSovDQogDQpAQCAtMTQ4
LDcgKzExOSwxNyBAQCBnZXRjaHIodm9pZCkNCiB2b2lkDQogc2Nicih2b2lkKQ0KIAl7DQotCWd0
dHkoMCwmdHR4KTsJCWRvcmF3KHR0eCk7CQlzdHR5KDAsJnR0eCk7DQorCXRjZ2V0YXR0cigwLCZ0
dHgpOwkNCisJLyogZG9yYXcgKi8NCisJaWYgKCFyYXdmbGcpIHsNCisJICArK3Jhd2ZsZzsNCisJ
ICBzYXZlZW9mPXR0eC5jX2NjW1ZNSU5dOw0KKwkgIHNhdmVlb2w9dHR4LmNfY2NbVlRJTUVdOw0K
Kwl9DQorCXR0eC5jX2NjW1ZNSU5dPTE7DQorCXR0eC5jX2NjW1ZUSU1FXT0xOw0KKwl0dHguY19s
ZmxhZyAmPSB+KElDQU5PTnxFQ0hPfEVDSE9FfEVDSE9LfEVDSE9OTCk7DQorCXRjc2V0YXR0cigw
LFRDU0FOT1csJnR0eCk7DQogCX0NCiANCiAvKg0KQEAgLTE1OSw3ICsxNDAsMTIgQEAgc2Nicih2
b2lkKQ0KIHZvaWQNCiBzbmNicih2b2lkKQ0KIAl7DQotCWd0dHkoMCwmdHR4KTsJCXVucmF3KHR0
eCk7CQlzdHR5KDAsJnR0eCk7DQorCXRjZ2V0YXR0cigwLCZ0dHgpOw0KKwkvKiB1bnJhdyAqLw0K
Kwl0dHguY19jY1tWTUlOXT1zYXZlZW9mOw0KKwl0dHguY19jY1tWVElNRV09c2F2ZWVvbDsNCisJ
dHR4LmNfbGZsYWcgfD0gSUNBTk9OfEVDSE98RUNIT0V8RUNIT0t8RUNIT05MOw0KKwl0Y3NldGF0
dHIoMCxUQ1NBTk9XLCZ0dHgpOw0KIAl9DQogDQogLyoNCmRpZmYgLS1naXQgYS9nYW1lcy9sYXJu
L3NpZ25hbC5jIGIvZ2FtZXMvbGFybi9zaWduYWwuYw0KaW5kZXggYTY5Zjk4Ni4uNTZhMzliNSAx
MDA2NDQNCi0tLSBhL2dhbWVzL2xhcm4vc2lnbmFsLmMNCisrKyBiL2dhbWVzL2xhcm4vc2lnbmFs
LmMNCkBAIC0xMjYsOCArMTI2LDYgQEAgc2lnc2V0dXAodm9pZCkNCiAjZW5kaWYgLyogU0lHVFNU
UCAqLw0KIAl9DQogDQotI2lmZGVmIEJTRAkvKiBmb3IgQlNEIFVOSVg/ICovDQotDQogc3RhdGlj
IGNvbnN0IGNoYXIgKnNpZ25hbWVbTlNJR10gPSB7ICIiLA0KICJTSUdIVVAiLCAgLyoJMQkgaGFu
Z3VwICovDQogIlNJR0lOVCIsICAvKgkyCSBpbnRlcnJ1cHQgKi8NCkBAIC0xNTYsMzMgKzE1NCwx
MSBAQCBzdGF0aWMgY29uc3QgY2hhciAqc2lnbmFtZVtOU0lHXSA9IHsgIiIsDQogIlNJR1hGU1oi
LCAvKgkyNQkgZXhjZWVkZWQgZmlsZSBzaXplIGxpbWl0ICovDQogIlNJR1ZUQUxSTSIsLyogIDI2
CSB2aXJ0dWFsIHRpbWUgYWxhcm0gKi8NCiAiU0lHUFJPRiIsIC8qCTI3CSBwcm9maWxpbmcgdGlt
ZSBhbGFybSAqLw0KLSIiLCIiLCIiLCIiIH07DQotDQotI2Vsc2UJCS8qIGZvciBzeXN0ZW0gVj8g
Ki8NCi0NCi1zdGF0aWMgY29uc3QgY2hhciAqc2lnbmFtZVtOU0lHXSA9IHsgIiIsDQotIlNJR0hV
UCIsICAvKgkxCSBoYW5ndXAgKi8NCi0iU0lHSU5UIiwgIC8qCTIJIGludGVycnVwdCAqLw0KLSJT
SUdRVUlUIiwgLyoJMwkgcXVpdCAqLw0KLSJTSUdJTEwiLCAgLyoJNAkgaWxsZWdhbCBpbnN0cnVj
dGlvbiAobm90IHJlc2V0IHdoZW4gY2F1Z2h0KSAqLw0KLSJTSUdUUkFQIiwgLyoJNQkgdHJhY2Ug
dHJhcCAobm90IHJlc2V0IHdoZW4gY2F1Z2h0KSAqLw0KLSJTSUdJT1QiLCAgLyoJNgkgSU9UIGlu
c3RydWN0aW9uICovDQotIlNJR0VNVCIsICAvKgk3CSBFTVQgaW5zdHJ1Y3Rpb24gKi8NCi0iU0lH
RlBFIiwgIC8qCTgJIGZsb2F0aW5nIHBvaW50IGV4Y2VwdGlvbiAqLw0KLSJTSUdLSUxMIiwgLyoJ
OQkga2lsbCAoY2Fubm90IGJlIGNhdWdodCBvciBpZ25vcmVkKSAqLw0KLSJTSUdCVVMiLCAgLyoJ
MTAJIGJ1cyBlcnJvciAqLw0KLSJTSUdTRUdWIiwgLyoJMTEJIHNlZ21lbnRhdGlvbiB2aW9sYXRp
b24gKi8NCi0iU0lHU1lTIiwgIC8qCTEyCSBiYWQgYXJndW1lbnQgdG8gc3lzdGVtIGNhbGwgKi8N
Ci0iU0lHUElQRSIsIC8qCTEzCSB3cml0ZSBvbiBhIHBpcGUgd2l0aCBubyBvbmUgdG8gcmVhZCBp
dCAqLw0KLSJTSUdBTFJNIiwgLyoJMTQJIGFsYXJtIGNsb2NrICovDQotIlNJR1RFUk0iLCAvKgkx
NQkgc29mdHdhcmUgdGVybWluYXRpb24gc2lnbmFsIGZyb20ga2lsbCAqLw0KLSJTSUdVU1IxIiwg
IC8qCTE2CSB1c2VyIGRlZmluZXMgc2lnbmFsIDEgKi8NCi0iU0lHVVNSMiIsIC8qCTE3CSB1c2Vy
IGRlZmluZXMgc2lnbmFsIDIgKi8NCi0iU0lHQ0xEIiwgIC8qCTE4CSBjaGlsZCBkZWF0aCAqLw0K
LSJTSUdQV1IiLCAgLyoJMTkJIHBvd2VyIGZhaWwgKi8NCi0iIiwiIiwiIiwiIiwiIiwiIiwiIiwi
IiwiIiwiIiwiIiwiIiB9Ow0KLQ0KLSNlbmRpZiAvKiBCU0QgKi8NCisiU0lHV0lOQ0giLC8qCTI4
CSB3aW5kb3cgc2l6ZSBjaGFuZ2VzICovDQorIlNJR0lORk8iLC8qCTI5CSBpbmZvcm1hdGlvbiBy
ZXF1ZXN0ICovDQorIlNJR1VTUjEiLC8qCTMwCSB1c2VyIGRlZmluZWQgc2lnbmFsIDEgKi8NCisi
U0lHVVNSMiIsLyoJMzEJIHVzZXIgZGVmaW5lZCBzaWduYWwgMiAqLw0KK307DQogDQogLyoNCiAg
Kglyb3V0aW5lIHRvIHByb2Nlc3MgYSBmYXRhbCBlcnJvciBzaWduYWwNCg==
--===============1849954035==--