diff --git a/autoconf/scripts/benchmark.sh b/autoconf/scripts/benchmark.sh index 37ef35d..5c94957 100755 --- a/autoconf/scripts/benchmark.sh +++ b/autoconf/scripts/benchmark.sh @@ -5,10 +5,10 @@ # time, as suggested by Ville Herva . # -test_input=`mktemp /tmp/pvbench1XXXXXX` -strace_output=`mktemp /tmp/pvbench2XXXXXX` +test_input=$(mktemp /tmp/pvbench1XXXXXX) +strace_output=$(mktemp /tmp/pvbench2XXXXXX) -trap "rm -f ${test_input} ${strace_output}" 0 +trap "rm -f ${test_input} ${strace_output}" EXIT pv=${pv:-./pv} test -x ${pv} || pv=pv diff --git a/autoconf/scripts/depend.sh b/autoconf/scripts/depend.sh index f17f81e..9df70bd 100755 --- a/autoconf/scripts/depend.sh +++ b/autoconf/scripts/depend.sh @@ -3,22 +3,22 @@ # Generate dependencies for a C source file. # -CC=$1 +CC="$1" shift -file=$1 +file="$1" shift -stem=$1 +stem="$1" shift -srcdir=$1 -abssrc=`echo $srcdir | sed ':1 +srcdir="$1" +abssrc=$(echo "$srcdir" | sed ':1 s,^\./,,g -t1'` +t1') shift -abssrc=`echo "$abssrc" | sed 's,\\.,\\\\.,g'` -srcdir=`echo "$srcdir" | sed 's,\\.,\\\\.,g'` +abssrc=$(echo "$abssrc" | sed 's,\\.,\\\\.,g') +srcdir=$(echo "$srcdir" | sed 's,\\.,\\\\.,g') -$CC -M -MG $* $file \ +$CC -M -MG $* "$file" \ | sed -e 's, /[^ ]*,,g' -e "s,^.*\.o:,${stem}.d ${stem}.o:," \ -e '/^ \\$/d' -e 's/ \\$//' \ -e 's,'"$srcdir"'/,,g' -e 's,'"$abssrc"'/,,g' \ diff --git a/autoconf/scripts/index.sh b/autoconf/scripts/index.sh index b402546..0e0f067 100755 --- a/autoconf/scripts/index.sh +++ b/autoconf/scripts/index.sh @@ -35,14 +35,14 @@ html_safebr () { | sed -e 's|&|\&|g;s|<|\<|g;s|>|\>|g;s/$/
/' } -ALLFILES=`find . -name '*~' -prune -o -type f -name '*.c' \ - -exec grep -FL '!NOINDEX' /dev/null '{}' ';'` +ALLFILES=$(find . -name '*~' -prune -o -type f -name '*.c' \ + -exec grep -FL '!NOINDEX' /dev/null '{}' ';') -CTAGDATA=`echo "$ALLFILES" \ +CTAGDATA=$(echo "$ALLFILES" \ | ctags -nRf- -L- --c-types=f \ - | sed 's/ .\// /;s/;" .*$//'` + | sed 's/ .\// /;s/;" .*$//') -FILELIST=`echo "$CTAGDATA" | cut -d ' ' -f 2 | sort | uniq` +FILELIST=$(echo "$CTAGDATA" | cut -d ' ' -f 2 | sort | uniq) echo '' echo 'Source Code Index' @@ -63,25 +63,25 @@ echo '

' for FILE in $FILELIST; do - DIR=`dirname $FILE` - FUNCDEFS=`cproto -f1 -I. -Isrc/include -I$DIR $FILE 2>/dev/null \ - | sed -n 's/^.*[ *]\([^ *(]*\)(.*$/\1/p'` - FILEHEAD="`sed -n -e \ + DIR=$(dirname $FILE) + FUNCDEFS=$(cproto -f1 -I. -Isrc/include -I$DIR $FILE 2>/dev/null \ + | sed -n 's/^.*[ *]\([^ *(]*\)(.*$/\1/p') + FILEHEAD="$(sed -n -e \ '1,/\*\//{/\/\*/,/\*\//{s/^[\/ *]//;s/^\*[\/]*//;p;};}' \ - < $FILE`" - FILESHORTDESC=`echo "$FILEHEAD" | sed -n '1,/^ *$/{/^ *[^ ]*/p;}'` - FILELONGDESC=`echo "$FILEHEAD" | sed '1,/^ *$/d'` + < $FILE)" + FILESHORTDESC=$(echo "$FILEHEAD" | sed -n '1,/^ *$/{/^ *[^ ]*/p;}') + FILELONGDESC=$(echo "$FILEHEAD" | sed '1,/^ *$/d') echo '

' echo '

' echo '' echo '' - echo '' + echo '' echo '
' echo ''"$FILE"' - '`html_safe "$FILESHORTDESC"`''$(html_safe "$FILESHORTDESC")'

' echo '

[View File]

' echo '

' - echo "`html_safebr "$FILELONGDESC"`" + echo "$(html_safebr "$FILELONGDESC")" echo '

' if [ -n "$FUNCDEFS" ]; then @@ -110,17 +110,17 @@ echo '

' echo "$CTAGDATA" | while read FUNC FILE LINENUM REST; do - FUNCDEF=`sed -n "$LINENUM,/{/p" < $FILE \ + FUNCDEF=$(sed -n "$LINENUM,/{/p" < $FILE \ | tr '\n' ' ' \ - | tr -d '{'` + | tr -d '{') - LASTCOMLINE=`sed -n '1,'"$LINENUM"'{/\/\*/=;}' < $FILE | sed -n '$p'` + LASTCOMLINE=$(sed -n '1,'"$LINENUM"'{/\/\*/=;}' < $FILE | sed -n '$p') [ -z "$LASTCOMLINE" ] && LASTCOMLINE=1 - LASTENDFUNCLINE=`sed -n '1,'"$LINENUM"'{/}/=;}' < $FILE | sed -n '$p'` + LASTENDFUNCLINE=$(sed -n '1,'"$LINENUM"'{/}/=;}' < $FILE | sed -n '$p') [ -z "$LASTENDFUNCLINE" ] && LASTENDFUNCLINE=1 - FUNCHEAD="`sed -n -e \ + FUNCHEAD="$(sed -n -e \ "$LASTCOMLINE,"'/\*\//{h;s/^[\/ *]//;s/^\*[\/]*//;p;x;/\*\//q;}' \ - < $FILE`" + < $FILE)" [ "$LASTCOMLINE" -le "$LASTENDFUNCLINE" ] && FUNCHEAD="" echo '

' @@ -131,10 +131,10 @@ echo "$CTAGDATA" | while read FUNC FILE LINENUM REST; do echo "$FILE"']' echo '

' - echo '

'"`html_safe "$FUNCDEF"`"'

' + echo '

'"$(html_safe "$FUNCDEF")"'

' echo '

' - echo "`html_safebr "$FUNCHEAD"`" + echo "$(html_safebr "$FUNCHEAD")" echo '

' echo '

[' @@ -147,10 +147,10 @@ echo '

To Do Listing

' echo '