coccinelle: grep Options and Requires fields more precisely (e0be348e) · Commits · 戴 / test

Currently, the required version for badzero.cocci is picked up from its "Comments:" line since it contains the word "Requires". Surprisingly, ld-version.sh can extract the version number from the string "Requires Coccinelle version 1.0.0-rc20 or later", but this expectation is fragile. Fix the .cocci file. I removed "-rc20" because ld-version.sh cannot handle it. Make the coccicheck script to see exact patterns for "Options:" and "Requires:" in order to avoid accidental matching to what just happens to appear in comment lines. Signed-off-by:

Masahiro Yamada <yamada.masahiro@socionext.com> Acked-by:

Julia Lawall <julia.lawall@lip6.fr> Acked-by:

Nicolas Palix <nicolas.palix@imag.fr>

scripts/coccicheck

+2 −2

Original line number	Diff line number	Diff line
		@@ -168,8 +168,8 @@ OPTIONS="$OPTIONS $SPFLAGS"
		coccinelle () {
		COCCI="$1"

		OPT=`grep "Option" $COCCI \| cut -d':' -f2`
		REQ=`grep "Requires" $COCCI \| cut -d':' -f2 \| sed "s\| \|\|"`
		OPT=`grep "Options:" $COCCI \| cut -d':' -f2`
		REQ=`grep "Requires:" $COCCI \| cut -d':' -f2 \| sed "s\| \|\|"`
		REQ_NUM=$(echo $REQ \| ${DIR}/scripts/ld-version.sh)
		if [ "$REQ_NUM" != "0" ] ; then
		if [ "$SPATCH_VERSION_NUM" -lt "$REQ_NUM" ] ; then

scripts/coccinelle/null/badzero.cocci

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		// Copyright: (C) 2012 Julia Lawall, INRIA/LIP6. GPLv2.
		// Copyright: (C) 2012 Gilles Muller, INRIA/LiP6. GPLv2.
		// URL: http://coccinelle.lip6.fr/
		// Comments: Requires Coccinelle version 1.0.0-rc20 or later
		// Requires: 1.0.0
		// Options:

		virtual patch

Admin message