From: John Hughes <john@Calva.COM>
Date: Fri, 26 Oct 2001 08:05:49 +0000 (+0000)
Subject: don't lose ioctls if comment spans 2 lines
X-Git-Tag: v4.5.18~1001
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa519575fdd3b1bb13f307b819869d97b50812ba;p=strace

don't lose ioctls if comment spans 2 lines
---

diff --git a/ChangeLog b/ChangeLog
index f9acb485..80e2c708 100644
--- 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 2ee7ad0b..174a37b0 100644
--- 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) ">" }' |