From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/scripts/fix_ws.sh | 71 ++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100755 release/src/router/busybox/scripts/fix_ws.sh (limited to 'release/src/router/busybox/scripts/fix_ws.sh') diff --git a/release/src/router/busybox/scripts/fix_ws.sh b/release/src/router/busybox/scripts/fix_ws.sh new file mode 100755 index 00000000..e7cf529a --- /dev/null +++ b/release/src/router/busybox/scripts/fix_ws.sh @@ -0,0 +1,71 @@ +#!/bin/bash +# Whitespace fixer +# Usage: fix_ws [dir]... + +temp="/tmp/fix_ws.$$.$RANDOM" + +# Using $'xxx' bashism +begin8sp_tab=$'s/^ /\t/' +beginchar7sp_chartab=$'s/^\\([^ \t]\\) /\\1\t/' +tab8sp_tabtab=$'s/\t /\t\t/g' +tab8sptab_tabtabtab=$'s/\t \t/\t\t\t/g' +begin17sptab_tab=$'s/^ \\{1,7\\}\t/\t/' +tab17sptab_tabtab=$'s/\t \\{1,7\\}\t/\t\t/g' +trailingws_=$'s/[ \t]*$//' + +#>fix_ws.diff + +find "$@" -type f \ +| while read name; do + test "YES" = "${name/*.bz2/YES}" && continue + test "YES" = "${name/*.gz/YES}" && continue + test "YES" = "${name/*.png/YES}" && continue + test "YES" = "${name/*.gif/YES}" && continue + test "YES" = "${name/*.jpg/YES}" && continue + test "YES" = "${name/*.diff/YES}" && continue + test "YES" = "${name/*.patch/YES}" && continue + # shell testsuite entries are not to be touched too + test "YES" = "${name/*.right/YES}" && continue + + if test "YES" = "${name/*.[chsS]/YES}" \ + -o "YES" = "${name/*.sh/YES}" \ + -o "YES" = "${name/*.txt/YES}" \ + -o "YES" = "${name/*.html/YES}" \ + -o "YES" = "${name/*.htm/YES}" \ + -o "YES" = "${name/*Config.in*/YES}" \ + ; then + # More aggressive whitespace fixes for known file types + echo "Formatting: $name" >&2 + cat "$name" \ + | sed -e "$tab8sptab_tabtabtab" -e "$tab8sptab_tabtabtab" \ + -e "$tab8sptab_tabtabtab" -e "$tab8sptab_tabtabtab" \ + | sed "$begin17sptab_tab" \ + | sed -e "$tab17sptab_tabtab" -e "$tab17sptab_tabtab" \ + -e "$tab17sptab_tabtab" -e "$tab17sptab_tabtab" \ + -e "$tab17sptab_tabtab" -e "$tab17sptab_tabtab" \ + | sed "$trailingws_" + elif test "YES" = "${name/*Makefile*/YES}" \ + -o "YES" = "${name/*Kbuild*/YES}" \ + ; then + # For Makefiles, never convert "1-7spaces+tab" into "tabtab" + echo "Makefile: $name" >&2 + cat "$name" \ + | sed -e "$tab8sptab_tabtabtab" -e "$tab8sptab_tabtabtab" \ + -e "$tab8sptab_tabtabtab" -e "$tab8sptab_tabtabtab" \ + | sed -e "$tab17sptab_tabtab" -e "$tab17sptab_tabtab" \ + -e "$tab17sptab_tabtab" -e "$tab17sptab_tabtab" \ + -e "$tab17sptab_tabtab" -e "$tab17sptab_tabtab" \ + | sed "$trailingws_" + else + # Only remove trailing WS for the rest + echo "Removing trailing whitespace: $name" >&2 + cat "$name" \ + | sed "$trailingws_" + fi >"$temp" + +# diff -u "$temp" "$name" >>fix_ws.diff + + # Conserve mode/symlink: + cat "$temp" >"$name" +done +rm "$temp" 2>/dev/null -- cgit v1.2.3-54-g00ecf