From: Sumera Priyadarsini <sylphrenadin@gmail.com>
To: cocci@systeme.lip6.fr
Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org,
Julia.Lawall@lip6.fr, Gilles.Muller@lip6.fr,
masahiroy@kernel.org, michal.lkml@markovi.net,
nicolas.palix@imag.fr
Subject: [PATCH V2] scripts: coccicheck: Do not use shift command when rule is specfified
Date: Wed, 9 Sep 2020 13:39:39 +0530 [thread overview]
Message-ID: <20200909080939.bhkgluvo5zw2kder@adolin> (raw)
The command "make coccicheck C=1 CHECK=scripts/coccicheck" results in the
error:
./scripts/coccicheck: line 65: -1: shift count out of range
This happens because every time the C variable is specified,
the shell arguments need to be "shifted" in order to take only
the last argument, which is the C file to test. These shell arguments
mostly comprise flags that have been set in the Makefile. However,
when coccicheck is specified in the make command as a rule, the
number of shell arguments is zero, thus passing the invalid value -1
to the shift command, resulting in an error.
Modify coccicheck to use the shift command only when
number of shell arguments is not zero.
Signed-off-by: Sumera Priyadarsini <sylphrenadin@gmail.com>
---
Changes in V2:
- Fix spelling errors as suggested by Markus Elfring
---
scripts/coccicheck | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/scripts/coccicheck b/scripts/coccicheck
index e04d328210ac..5c8df337e1e3 100755
--- a/scripts/coccicheck
+++ b/scripts/coccicheck
@@ -61,9 +61,19 @@ COCCIINCLUDE=${COCCIINCLUDE// -include/ --include}
if [ "$C" = "1" -o "$C" = "2" ]; then
ONLINE=1
- # Take only the last argument, which is the C file to test
- shift $(( $# - 1 ))
- OPTIONS="$COCCIINCLUDE $1"
+ # If the rule coccicheck is specified when calling make, number of
+ # arguments is zero
+ if [ $# -ne 0 ]; then
+ # Take only the last argument, which is the C file to test
+ shift $(( $# -1 ))
+ OPTIONS="$COCCIINCLUDE $1"
+ else
+ if [ "$KBUILD_EXTMOD" = "" ] ; then
+ OPTIONS="--dir $srctree $COCCIINCLUDE"
+ else
+ OPTIONS="--dir $KBUILD_EXTMOD $COCCIINCLUDE"
+ fi
+ fi
# No need to parallelize Coccinelle since this mode takes one input file.
NPROC=1
--
2.25.1
reply other threads:[~2020-09-09 8:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200909080939.bhkgluvo5zw2kder@adolin \
--to=sylphrenadin@gmail.com \
--cc=Gilles.Muller@lip6.fr \
--cc=Julia.Lawall@lip6.fr \
--cc=cocci@systeme.lip6.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=nicolas.palix@imag.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®