don't lose ioctls if comment spans 2 lines

diff --git a/ChangeLog b/ChangeLog
index f9acb485fceb92c658c5c27b50fca0853967d1d2..80e2c708c3728a12059d81ad064b3328bfdb0aaf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-26  John Hughes <john@calva.com>
+
+       * svr4/ioctlent.sh: Cope with #define lines containing
+       comments that terminate on subsequent lines.  Used to
+       comment out subsequent ioctls!
+
 2001-10-25  Wichert Akkerman <wakkerma@debian.org>
 
        * linux/ioctlent.h: regenerated using current scripts so

diff --git a/svr4/ioctlent.sh b/svr4/ioctlent.sh
index 2ee7ad0bab83ff798590f524921fdc5f7047c945..174a37b04075b95203c7d38d8ede56157824ad63 100644 (file)
--- a/svr4/ioctlent.sh
+++ b/svr4/ioctlent.sh
@@ -39,7 +39,7 @@ bad_defines='cg[48]var\.h|READSLICE|I_E_RECVFD|FBIOGPIXRECT|JTIMO|TTYTYPE|TIOCCO
        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 |
-               sed 's/\(.*\):#[        ]*define[       ]*\([A-Z_][A-Za-z0-9_]*\)[      ]*\(([^)]*)\)[  ]*\(.*\)/       { "\1", "\2",   \2      },      \4/'
+               sed 's/\(.*\):#[        ]*define[       ]*\([A-Z_][A-Za-z0-9_]*\)[      ]*\(([^)]*)\)[  ]*\(.*\)/       { "\1", "\2",   \2      },      \4 \/**\//'
 ) >ioctlent.tmp
 cat ioctlent.tmp |
        awk '{ print "#include <" substr($2, 2, length($2) - 3) ">" }' |