diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2013-07-16 00:41:04 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2013-07-16 00:41:04 +0000 |
| commit | c3ba8bbc08b256452f21213787119ba018a6dd1c (patch) | |
| tree | 50131b673f0201ada2620c1f1b3478d792de54c1 /usr.bin | |
| parent | e1389f6f4ce09ce3b74782d0c8bf838353a40ceb (diff) | |
Tighten the pattern for matching ioctl definitions in header files and
recognize the PTMGET ioctl()
ok millert@
(earlier version ok otto@)
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/kdump/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/kdump/mkioctls | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index f96b14c93b5..7a5c388468a 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2013/03/15 09:10:52 ratchov Exp $ +# $OpenBSD: Makefile,v 1.23 2013/07/16 00:41:03 guenther Exp $ LDSTATIC=${STATIC} PROG= kdump @@ -23,6 +23,7 @@ ioctl.c: ${.CURDIR}/Makefile ${.CURDIR}/mkioctls /usr/include/net/pfvar.h \ /usr/include/net80211/ieee80211_ioctl.h \ /usr/include/netinet6/in6_var.h \ + /usr/include/sys/tty.h \ /usr/include/sys/agpio.h \ /usr/include/sys/ataio.h \ /usr/include/sys/audioio.h \ diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls index 0a53184b105..c0e833e640b 100644 --- a/usr.bin/kdump/mkioctls +++ b/usr.bin/kdump/mkioctls @@ -1,5 +1,5 @@ #!/bin/sh - -# $OpenBSD: mkioctls,v 1.28 2013/03/15 09:10:52 ratchov Exp $ +# $OpenBSD: mkioctls,v 1.29 2013/07/16 00:41:03 guenther Exp $ # # Copyright (c) 1994 @@ -72,6 +72,7 @@ BEGIN { print "#include <sys/radioio.h>" print "#include <sys/scanio.h>" print "#include <sys/scsiio.h>" + print "#include <sys/tty.h>" print "#include <crypto/cryptodev.h>" print "#include <dev/biovar.h>" print "#include <dev/systrace.h>" @@ -88,7 +89,7 @@ BEGIN { print "" } -/^#[ ]*define[ ]*(AGPIOC_|ATAIO|AUDIO_|BIOC|CDIO|CIOC|CHIO|DIOC|GPIO|TIO|FIO|MTIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX)[A-Z_0-9]*[ ]*_IO/ { +/^[ ]*#[ ]*define[ ]+(AGPIOC_|ATAIO|AUDIO_|BIOC|CDIO|CIOC|CHIO|DIOC|GPIO|TIO|FIO|MTIOC|SIO|OSIO|SESIOC_|SIOC|PCIOC|PPPIOC|PPPOE|RIOC|RND|STRIOC|SCIOC|OSCIOC|TUN|VNDIOC|WSKBD|WSMOUSE|WSDISPLAY|WSMUX|PTM)[A-Z_0-9]*[ ]+_IO/ { # find where the name starts for (i = 1; i <= NF; i++) |