diff options
| author | Tom de Vries <tom@codesourcery.com> | 2015-05-18 07:07:44 +0000 |
|---|---|---|
| committer | Tom de Vries <vries@gcc.gnu.org> | 2015-05-18 07:07:44 +0000 |
| commit | ad7f0dfea36432e93344c203e427bcedf75a2644 (patch) | |
| tree | c848add72a05e4dacbf92c0e178c727d3a64b6a3 | |
| parent | 847b6e15110004f440d09ac2206ff112e9bafeaf (diff) | |
| download | gcc-ad7f0dfea36432e93344c203e427bcedf75a2644.zip gcc-ad7f0dfea36432e93344c203e427bcedf75a2644.tar.gz gcc-ad7f0dfea36432e93344c203e427bcedf75a2644.tar.bz2 | |
check_GNU_style.sh: Don't cat empty file
2015-05-18 Tom de Vries <tom@codesourcery.com>
* check_GNU_style.sh (g, ag, vg): Don't cat empty file.
From-SVN: r223284
| -rw-r--r-- | contrib/ChangeLog | 4 | ||||
| -rwxr-xr-x | contrib/check_GNU_style.sh | 30 |
2 files changed, 28 insertions, 6 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 1ab3fdf..8276c98 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,5 +1,9 @@ 2015-05-18 Tom de Vries <tom@codesourcery.com> + * check_GNU_style.sh (g, ag, vg): Don't cat empty file. + +2015-05-18 Tom de Vries <tom@codesourcery.com> + * check_GNU_style.sh (g, ag, vg, col): Declare local vars with local. 2015-05-18 Tom de Vries <tom@codesourcery.com> diff --git a/contrib/check_GNU_style.sh b/contrib/check_GNU_style.sh index 728c11a..ab59b1e 100755 --- a/contrib/check_GNU_style.sh +++ b/contrib/check_GNU_style.sh @@ -84,10 +84,16 @@ grep $format '^+' $files \ g (){ local msg="$1" local arg="$2" + + local found=false cat $inp \ | egrep --color=always -- "$arg" \ - > $tmp && printf "\n$msg\n" - cat $tmp + > "$tmp" && found=true + + if $found; then + printf "\n$msg\n" + cat "$tmp" + fi } # And Grep @@ -95,11 +101,17 @@ ag (){ local msg="$1" local arg1="$2" local arg2="$3" + + local found=false cat $inp \ | egrep --color=always -- "$arg1" \ | egrep --color=always -- "$arg2" \ - > $tmp && printf "\n$msg\n" - cat $tmp + > "$tmp" && found=true + + if $found; then + printf "\n$msg\n" + cat "$tmp" + fi } # reVerse Grep @@ -107,11 +119,17 @@ vg (){ local msg="$1" local varg="$2" local arg="$3" + + local found=false cat $inp \ | egrep -v -- "$varg" \ | egrep --color=always -- "$arg" \ - > $tmp && printf "\n$msg\n" - cat $tmp + > "$tmp" && found=true + + if $found; then + printf "\n$msg\n" + cat "$tmp" + fi } col (){ |