diff options
| -rw-r--r-- | contrib/ChangeLog | 5 | ||||
| -rwxr-xr-x | contrib/check_GNU_style.sh | 14 |
2 files changed, 16 insertions, 3 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 8035bc3..774e46f 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2015-05-12 Tom de Vries <tom@codesourcery.com> + + * check_GNU_style.sh: Don't use a filename prefix if we're only + processing one patch file. + 2015-05-12 Yury Gribov <y.gribov@samsung.com> * mklog: Ignore preprocessor directives. diff --git a/contrib/check_GNU_style.sh b/contrib/check_GNU_style.sh index e8d5dca..eeff48f 100755 --- a/contrib/check_GNU_style.sh +++ b/contrib/check_GNU_style.sh @@ -36,6 +36,8 @@ EOF } test $# -eq 0 && usage +nfiles=$# +files="$*" inp=check_GNU_style.inp tmp=check_GNU_style.tmp @@ -44,9 +46,15 @@ tmp=check_GNU_style.tmp trap "rm -f $inp $tmp" 0 trap "rm -f $inp $tmp ; exit 1" 1 2 3 5 9 13 15 -grep -nH '^+' $* \ - | grep -v ':+++' \ - > $inp +if [ $nfiles -eq 1 ]; then + # There's no need for the file prefix if we're dealing only with one file. + format="-n" +else + format="-nH" +fi +grep $format '^+' $files \ + | grep -v ':+++' \ + > $inp # Grep g (){ |