Hi, this patch makes sure we either handle: ... $ cat temp.patch | ./check_GNU_style.sh - ... or ... $ ./check_GNU_style.sh temp.patch ... but not: ... $ cat temp.patch | ./check_GNU_style.sh - temp2.patch ...
OK for trunk? Thanks, - Tom
[PATCH 3/5] check_GNU_style.sh: Read either from stdin, or from files 2015-05-11 Tom de Vries <t...@codesourcery.com> * check_GNU_style.sh: Read either from stdin, or from files. --- contrib/check_GNU_style.sh | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/contrib/check_GNU_style.sh b/contrib/check_GNU_style.sh index 2c4d9e2..f00b3d5 100755 --- a/contrib/check_GNU_style.sh +++ b/contrib/check_GNU_style.sh @@ -39,12 +39,22 @@ test $# -eq 0 && usage nfiles=$# files="$*" -for f in $files; do - if [ "$f" != "-" ] && [ ! -f "$f" ]; then - echo "error: could not read file: $f" - exit 1 - fi -done +stdin=false +if [ $nfiles -eq 1 ] && [ "$files" = "-" ]; then + stdin=true +else + for f in $files; do + if [ "$f" = "-" ]; then + # Let's keep things simple. Either we read from stdin, or we read + # from files specified on the command line, not both. + usage + fi + if [ ! -f "$f" ]; then + echo "error: could not read file: $f" + exit 1 + fi + done +fi inp=check_GNU_style.inp tmp=check_GNU_style.tmp -- 1.9.1
