cope with ioctl #defines with extraneous spaces

diff --git a/ChangeLog b/ChangeLog
index 17f5421c4a1b072390542f4286084edf4110def0..0edbec51025e09667bea59e63f6196a064ed2875 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-17  John Hughes <john@calva.com>
+
+       * svr4/ioctlent.sh: Some defines on UW come with too many spaces.
+
 2002-05-17  John Hughes <john@calva.com>
 
        * svr4/ioctlent.sh: Cope with #defines wrapped in #ifdefs.

diff --git a/svr4/ioctlent.sh b/svr4/ioctlent.sh
index 51b9c7f1272eeca8bd19cfdcca9ab0a6d4e20c71..ae9e36e269e92b6c0c737be5d060bf6180c39de9 100644 (file)
--- a/svr4/ioctlent.sh
+++ b/svr4/ioctlent.sh
@@ -32,13 +32,13 @@ then
        exit 1
 fi
 
-bad_includes='cg[48]var\.h'
+bad_includes='cg[48]var\.h|sys/spad\.h'
 bad_defines='cg[48]var\.h|READSLICE|I_E_RECVFD|FBIOGPIXRECT|JTIMO|TTYTYPE|TIOCCONS|TCL_LINK|TCL_UNLINK'
 
 (
        cd $1 || exit
        find sys -name '*.h' -print |
-               xargs grep '^[   ]*#[    ]*define[       ][     ]*[A-Z_][A-Za-z0-9_]*[  ][       ]*([A-Za-z_][A-Za-z0-9_]*|[0-9][0-9]*)' /dev/null |
+               xargs grep '^[   ]*#[    ]*define[       ][     ]*[A-Z_][A-Za-z0-9_]*[  ][       ]*( *[A-Za-z_][A-Za-z0-9_]* *| *[0-9][0-9]* *)' /dev/null |
                sed 's/\(.*\):#[        ]*define[       ]*\([A-Z_][A-Za-z0-9_]*\)[      ]*\(([^)]*)\)[  ]*\(.*\)/       { "\1", "\2",   \2      },      \4 \/**\//'
 ) >ioctlent.tmp
 cat ioctlent.tmp |