ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: silence 'shift' error message in version_ge() 

If there are less than 2 arguments in version_ge(), the second
'shift' prints this error:
    ../configure: line 232: shift: shift count out of range

As Eric suggested, we can use 'shift ${2:+2}' which works out to
'shift 2' if $2 is set, or 'shift' (implicitly shift 1) if $2
is not set.

This patch replaces both 'shift; shift' occurrences in version_ge()
with 'shift ${2:+2}'.

Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200821203558.10338-1-sgarzare@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Stefano Garzarella 2020-08-21 22:35:58 +02:00 committed by Paolo Bonzini
parent 6dd93c2bde
commit c44a33e2fe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@ -228,15 +228,15 @@ version_ge () {
while true; do while true; do
set x $local_ver1 set x $local_ver1
local_first=${2-0} local_first=${2-0}
# shift 2 does nothing if there are less than 2 arguments # 'shift 2' if $2 is set, or 'shift' if $2 is not set
shift; shift shift ${2:+2}
local_ver1=$* local_ver1=$*
set x $local_ver2 set x $local_ver2
# the second argument finished, the first must be greater or equal # the second argument finished, the first must be greater or equal
test $# = 1 && return 0 test $# = 1 && return 0
test $local_first -lt $2 && return 1 test $local_first -lt $2 && return 1
test $local_first -gt $2 && return 0 test $local_first -gt $2 && return 0
shift; shift shift ${2:+2}
local_ver2=$* local_ver2=$*
done done
} }