diff options
Diffstat (limited to 'dist/s_whitespace')
| -rwxr-xr-x | dist/s_whitespace | 39 |
1 files changed, 11 insertions, 28 deletions
diff --git a/dist/s_whitespace b/dist/s_whitespace index 8cf3f7dfe6f..e60d85f8cc6 100755 --- a/dist/s_whitespace +++ b/dist/s_whitespace @@ -4,46 +4,29 @@ t=__wt.$$ trap 'rm -f $t; exit 0' 0 1 2 3 13 15 -# Clear lines that only contain whitespace, discard trailing empty lines. -whitespace() -{ - sed -e 's/[ ][ ]*$//' \ - -e '${' \ - -e '/^$/d' \ - -e '}' < $1 > $t - cmp $t $1 > /dev/null 2>&1 || (echo "$1" && cp $t $1) -} - # Clear lines that only contain whitespace, compress multiple empty lines # into a single line, discard trailing empty lines. -whitespace_and_empty_line() +whitespace() { - sed -e 's/[ ][ ]*$//' \ - -e '/^$/N' \ - -e '/\n$/D' < $1 > $t + sed -e 's/[ ][ ]*$//' < $1 | \ + cat -s | \ + sed -e '${' -e '/^$/d' -e '}' > $t cmp $t $1 > /dev/null 2>&1 || (echo "$1" && cp $t $1) } cd .. -# Scripts. -for f in `find dist -name '*.py' -name 's_*'`; do - whitespace_and_empty_line $f -done - -# C-language sources. -for f in `find bench examples ext src test \ +find bench dist examples ext src test \ -name '*.[chi]' -o \ -name '*.dox' -o \ -name '*.in' -o \ + -name '*.py' -o \ + -name 's_*' -o \ -name 'Makefile.am' | sed -e '/Makefile.in/d' \ - -e '/checksum\/power8/d'`; do - whitespace_and_empty_line $f -done - -# Python sources. -for f in `find test \ - -name '*.py' | sed '/3rdparty/d'`; do + -e '/checksum\/power8/d' \ + -e '/3rdparty/d' \ + -e '/docs\/tools/d' \ +| while read f ; do whitespace $f done |