From a22e33d04a2cb3c3501cd93d6273190f635206dd Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 12 May 2015 16:23:29 +0000 Subject: [PATCH] check_GNU_style.sh: Put stdin into temp file 2015-05-12 Tom de Vries * check_GNU_style.sh: Put stdin into a temp file. From-SVN: r223087 --- contrib/ChangeLog | 4 ++++ contrib/check_GNU_style.sh | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index da374975417..97941f77f00 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2015-05-12 Tom de Vries + + * check_GNU_style.sh: Put stdin into a temp file. + 2015-05-12 Tom de Vries * check_GNU_style.sh: Read either from stdin, or from files. diff --git a/contrib/check_GNU_style.sh b/contrib/check_GNU_style.sh index f00b3d54096..318eb6adca5 100755 --- a/contrib/check_GNU_style.sh +++ b/contrib/check_GNU_style.sh @@ -40,8 +40,15 @@ nfiles=$# files="$*" stdin=false +stdin_tmp="" if [ $nfiles -eq 1 ] && [ "$files" = "-" ]; then stdin=true + + # By putting stdin into a temp file, we can handle it just like any other + # file. F.i., we can cat it twice, which we can't do with stdin. + stdin_tmp=check_GNU_style.stdin + cat - > $stdin_tmp + files=$stdin_tmp else for f in $files; do if [ "$f" = "-" ]; then @@ -60,8 +67,8 @@ inp=check_GNU_style.inp tmp=check_GNU_style.tmp # Remove $tmp on exit and various signals. -trap "rm -f $inp $tmp" 0 -trap "rm -f $inp $tmp ; exit 1" 1 2 3 5 9 13 15 +trap "rm -f $inp $tmp $stdin_tmp" 0 +trap "rm -f $inp $tmp $stdin_tmp; exit 1" 1 2 3 5 9 13 15 if [ $nfiles -eq 1 ]; then # There's no need for the file prefix if we're dealing only with one file. -- 2.30.2