From 5eb78d5f7403ca282a028f924a17155172a1ac0f Mon Sep 17 00:00:00 2001 From: John Hughes Date: Fri, 17 May 2002 14:04:24 +0000 Subject: [PATCH] cope with ioctl #defines with extraneous spaces --- ChangeLog | 4 ++++ svr4/ioctlent.sh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17f5421c..0edbec51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2002-05-17 John Hughes + + * svr4/ioctlent.sh: Some defines on UW come with too many spaces. + 2002-05-17 John Hughes * svr4/ioctlent.sh: Cope with #defines wrapped in #ifdefs. diff --git a/svr4/ioctlent.sh b/svr4/ioctlent.sh index 51b9c7f1..ae9e36e2 100644 --- 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 |