diff options
author | Alastair Tse <atse@xensource.com> | 2007-01-12 14:53:13 +0000 |
---|---|---|
committer | Alastair Tse <atse@xensource.com> | 2007-01-12 14:53:13 +0000 |
commit | eb8b807d29e015dc65b5169ad37ee9df771b6a41 (patch) | |
tree | 433756f2e50b6a4e356b3d0f6f6dc2e255675ef9 | |
parent | effd10be68d89702eb60070f8e1bb9b0eded0c07 (diff) | |
download | xen-eb8b807d29e015dc65b5169ad37ee9df771b6a41.tar.gz xen-eb8b807d29e015dc65b5169ad37ee9df771b6a41.tar.bz2 xen-eb8b807d29e015dc65b5169ad37ee9df771b6a41.zip |
Make get-fields.sh really get run by bash rather than default /bin/sh.
Also fix some bashisms in the script.
Signed-off-by: Alastair Tse <atse@xensource.com>
-rw-r--r-- | xen/include/Makefile | 2 | ||||
-rw-r--r-- | xen/tools/get-fields.sh | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/xen/include/Makefile b/xen/include/Makefile index 15b347ca11..1f762d1024 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -65,7 +65,7 @@ compat/%.c: public/%.h xlat.lst Makefile compat/xlat.h: xlat.lst $(filter-out compat/xlat.h,$(headers-y)) $(BASEDIR)/tools/get-fields.sh Makefile grep -v '^[ ]*#' xlat.lst | \ while read what name hdr; do \ - $(SHELL) $(BASEDIR)/tools/get-fields.sh "$$what" compat_$$name $$(echo compat/$$hdr | sed 's,@arch@,$(compat-arch-y),g') || exit $$?; \ + /bin/bash $(BASEDIR)/tools/get-fields.sh "$$what" compat_$$name $$(echo compat/$$hdr | sed 's,@arch@,$(compat-arch-y),g') || exit $$?; \ done >$@.new mv -f $@.new $@ diff --git a/xen/tools/get-fields.sh b/xen/tools/get-fields.sh index d272c84e0b..ccf5675c02 100644 --- a/xen/tools/get-fields.sh +++ b/xen/tools/get-fields.sh @@ -111,7 +111,7 @@ for line in sys.stdin.readlines(): case "$token" in struct|union) test $level != 2 || fields=" " - if [ $level == 1 ] + if [ $level = 1 ] then kind=$token if [ $kind = union ] @@ -126,7 +126,7 @@ for line in sys.stdin.readlines(): ;; "}") level=$(expr $level - 1) id= - if [ $level == 1 -a $kind = union ] + if [ $level = 1 -a $kind = union ] then echo " \\" echo -n "$1}" @@ -148,7 +148,7 @@ for line in sys.stdin.readlines(): arrlvl=$(expr $arrlvl - 1) ;; COMPAT_HANDLE\(*\)) - if [ $level == 2 -a -z "$id" ] + if [ $level = 2 -a -z "$id" ] then type=${token#COMPAT_HANDLE?} type=${type%?} @@ -156,7 +156,7 @@ for line in sys.stdin.readlines(): fi ;; compat_domain_handle_t) - if [ $level == 2 -a -z "$id" ] + if [ $level = 2 -a -z "$id" ] then array_type=$token fi @@ -165,7 +165,7 @@ for line in sys.stdin.readlines(): id=$token ;; [\,\;]) - if [ $level == 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] + if [ $level = 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] then if [ $kind = union ] then @@ -257,7 +257,7 @@ build_body() { arrlvl=$(expr $arrlvl - 1) ;; COMPAT_HANDLE\(*\)) - if [ $level == 2 -a -z "$id" ] + if [ $level = 2 -a -z "$id" ] then type=${token#COMPAT_HANDLE?} type=${type%?} @@ -265,7 +265,7 @@ build_body() { fi ;; compat_domain_handle_t) - if [ $level == 2 -a -z "$id" ] + if [ $level = 2 -a -z "$id" ] then array_type=$token fi @@ -279,7 +279,7 @@ build_body() { fi ;; [\,\;]) - if [ $level == 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] + if [ $level = 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] then if [ -z "$array" -a -z "$array_type" ] then @@ -352,7 +352,7 @@ check_field() { id=$token ;; [\,\;]) - if [ $level == 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] + if [ $level = 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] then check_field $1 $2 $3.$id "$fields" test "$token" != ";" || fields= id= @@ -372,11 +372,11 @@ build_check() { do case "$token" in struct|union) - if [ $level == 1 ] + if [ $level = 1 ] then kind=$token echo -n " CHECK_SIZE_($kind, $1)" - elif [ $level == 2 ] + elif [ $level = 2 ] then fields=" " fi @@ -397,7 +397,7 @@ build_check() { test $level != 2 -o $arrlvl != 1 || id=$token ;; [\,\;]) - if [ $level == 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] + if [ $level = 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] then check_field $kind $1 $id "$fields" test "$token" != ";" || fields= id= |