Commit 6dad239f authored by bol-van's avatar bol-van
Browse files

blockcheck: fix infinite recursion on mac/bsd

parent aa4982a5

blockcheck.sh

+1 −1
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ report_append() 
	# save resources if only one domain

	[ "$DOMAINS_COUNT" -gt 1 ] && {

		hashstr="$2 : $3"

		hash="$(echo -n "$hashstr" | md5)"

		hash="$(echo -n "$hashstr" | md5f)"

		hashvar=RESHASH_${hash}

		hashcountvar=${hashvar}_COUNTER

common/base.sh

+2 −2
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ setup_md5() 
	exists $MD5 || MD5=md5

}



md5()

md5f()

{

	setup_md5

	$MD5 | cut -d ' ' -f1
@@ -343,7 +343,7 @@ random() 
		rs="$RANDOM$RANDOM$(date)"

	fi

	# shells use signed int64

	r=1$(echo $rs | md5 | sed 's/[^0-9]//g' | $RCUT)

	r=1$(echo $rs | md5f | sed 's/[^0-9]//g' | $RCUT)

	echo $(( ($r % ($2-$1+1)) + $1 ))

}