Merge pull request #851 from Neilpang/dev

fix for performance of _h2b() function
This commit is contained in:
neil 2017-05-17 13:26:54 +08:00 committed by GitHub
commit 4e20d89d9c

19
acme.sh
View File

@ -444,19 +444,27 @@ if [ "$(printf '\x41')" != 'A' ]; then
fi
_h2b() {
if _exists xxd; then
xxd -r -p
return
fi
hex=$(cat)
i=1
j=2
_debug3 _URGLY_PRINTF "$_URGLY_PRINTF"
while true; do
_debug2 _URGLY_PRINTF "$_URGLY_PRINTF"
if [ -z "$_URGLY_PRINTF" ]; then
while true; do
h="$(printf "%s" "$hex" | cut -c $i-$j)"
if [ -z "$h" ]; then
break
fi
printf "\x$h%s"
i="$(_math "$i" + 2)"
j="$(_math "$j" + 2)"
done
else
while true; do
ic="$(printf "%s" "$hex" | cut -c $i)"
jc="$(printf "%s" "$hex" | cut -c $j)"
if [ -z "$ic$jc" ]; then
@ -465,12 +473,11 @@ _h2b() {
ic="$(_h_char_2_dec "$ic")"
jc="$(_h_char_2_dec "$jc")"
printf '\'"$(printf "%o" "$(_math "$ic" \* 16 + $jc)")""%s"
fi
i="$(_math "$i" + 2)"
j="$(_math "$j" + 2)"
done
fi
}
_is_solaris() {