|
@@ -20,7 +20,7 @@ else
|
|
|
NPROC="$J"
|
|
|
fi
|
|
|
|
|
|
-FLAGS="$SPFLAGS -very_quiet"
|
|
|
+FLAGS="$SPFLAGS --very-quiet"
|
|
|
|
|
|
# spatch only allows include directories with the syntax "-I include"
|
|
|
# while gcc also allows "-Iinclude" and "-include include"
|
|
@@ -36,14 +36,14 @@ if [ "$C" = "1" -o "$C" = "2" ]; then
|
|
|
else
|
|
|
ONLINE=0
|
|
|
if [ "$KBUILD_EXTMOD" = "" ] ; then
|
|
|
- OPTIONS="-dir $srctree $COCCIINCLUDE"
|
|
|
+ OPTIONS="--dir $srctree $COCCIINCLUDE"
|
|
|
else
|
|
|
- OPTIONS="-dir $KBUILD_EXTMOD $COCCIINCLUDE"
|
|
|
+ OPTIONS="--dir $KBUILD_EXTMOD $COCCIINCLUDE"
|
|
|
fi
|
|
|
fi
|
|
|
|
|
|
if [ "$KBUILD_EXTMOD" != "" ] ; then
|
|
|
- OPTIONS="-patch $srctree $OPTIONS"
|
|
|
+ OPTIONS="--patch $srctree $OPTIONS"
|
|
|
fi
|
|
|
|
|
|
if [ ! -x "$SPATCH" ]; then
|
|
@@ -67,7 +67,7 @@ if [ "$MODE" = "chain" ] ; then
|
|
|
echo 'All available modes will be tried (in that order): patch, report, context, org'
|
|
|
fi
|
|
|
elif [ "$MODE" = "report" -o "$MODE" = "org" ] ; then
|
|
|
- FLAGS="$FLAGS -no_show_diff"
|
|
|
+ FLAGS="$FLAGS --no-show-diff"
|
|
|
fi
|
|
|
|
|
|
if [ "$ONLINE" = "0" ] ; then
|
|
@@ -83,7 +83,7 @@ run_cmd() {
|
|
|
echo "Running ($NPROC in parallel): $@"
|
|
|
fi
|
|
|
for i in $(seq 0 $(( NPROC - 1)) ); do
|
|
|
- eval "$@ -max $NPROC -index $i &"
|
|
|
+ eval "$@ --max $NPROC --index $i &"
|
|
|
SPATCH_PID[$i]=$!
|
|
|
if [ $VERBOSE -eq 2 ] ; then
|
|
|
echo "${SPATCH_PID[$i]} running"
|
|
@@ -106,7 +106,7 @@ coccinelle () {
|
|
|
|
|
|
OPT=`grep "Option" $COCCI | cut -d':' -f2`
|
|
|
|
|
|
-# The option '-parse_cocci' can be used to syntactically check the SmPL files.
|
|
|
+# The option '--parse-cocci' can be used to syntactically check the SmPL files.
|
|
|
#
|
|
|
# $SPATCH -D $MODE $FLAGS -parse_cocci $COCCI $OPT > /dev/null
|
|
|
|
|
@@ -147,20 +147,20 @@ coccinelle () {
|
|
|
|
|
|
if [ "$MODE" = "chain" ] ; then
|
|
|
run_cmd $SPATCH -D patch \
|
|
|
- $FLAGS -sp_file $COCCI $OPT $OPTIONS || \
|
|
|
+ $FLAGS --cocci-file $COCCI $OPT $OPTIONS || \
|
|
|
run_cmd $SPATCH -D report \
|
|
|
- $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff || \
|
|
|
+ $FLAGS --cocci-file $COCCI $OPT $OPTIONS --no-show-diff || \
|
|
|
run_cmd $SPATCH -D context \
|
|
|
- $FLAGS -sp_file $COCCI $OPT $OPTIONS || \
|
|
|
+ $FLAGS --cocci-file $COCCI $OPT $OPTIONS || \
|
|
|
run_cmd $SPATCH -D org \
|
|
|
- $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff || exit 1
|
|
|
+ $FLAGS --cocci-file $COCCI $OPT $OPTIONS --no-show-diff || exit 1
|
|
|
elif [ "$MODE" = "rep+ctxt" ] ; then
|
|
|
run_cmd $SPATCH -D report \
|
|
|
- $FLAGS -sp_file $COCCI $OPT $OPTIONS -no_show_diff && \
|
|
|
+ $FLAGS --cocci-file $COCCI $OPT $OPTIONS --no-show-diff && \
|
|
|
run_cmd $SPATCH -D context \
|
|
|
- $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1
|
|
|
+ $FLAGS --cocci-file $COCCI $OPT $OPTIONS || exit 1
|
|
|
else
|
|
|
- run_cmd $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1
|
|
|
+ run_cmd $SPATCH -D $MODE $FLAGS --cocci-file $COCCI $OPT $OPTIONS || exit 1
|
|
|
fi
|
|
|
|
|
|
}
|