From 4171ffe90d4139b9ad73751de9dc7d4c1b824230 Mon Sep 17 00:00:00 2001
From: Tom de Vries <tom@codesourcery.com>
Date: Tue, 12 May 2015 16:23:03 +0000
Subject: [PATCH] check_GNU_style.sh: Don't use filename prefix for one patch
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.
From-SVN: r223084
---
contrib/ChangeLog | 5 +++++
contrib/check_GNU_style.sh | 14 +++++++++++---
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 8035bc395a21..774e46f96f88 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 e8d5dcaf7bc1..eeff48f8c4c3 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 (){
--
GitLab