Git/testssl.sh
1
0
Fork 0
mirror of https://github.com/drwetter/testssl.sh.git synced 2025-10-30 21:35:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert to 2>&1 > /dev/null order because it isn't behaving correctly.

Browse Source
This commit is contained in:
Mark Felder
2015-03-13 14:56:30 -05:00
parent 59ed025f36
commit 4cdc89aa61
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
testssl.sh
View File

@@ -270,7 +270,7 @@ wait_kill(){
pid=$1 pid=$1
maxsleep=$2 maxsleep=$2
while true; do while true; do
if ! ps $pid >/dev/null 2>&1; then if ! ps $pid 2>&1 >/dev/null ; then
return 0 # didn't reach maxsleep yet return 0 # didn't reach maxsleep yet
fi fi
sleep 1 sleep 1
@@ -702,7 +702,7 @@ sockread() {
pid=$! pid=$!
while true; do while true; do
if ! ps $pid >/dev/null 2>&1; then if ! ps $pid 2>&1 >/dev/null ; then
break # didn't reach maxsleep yet break # didn't reach maxsleep yet
kill $pid >&2 2>/dev/null kill $pid >&2 2>/dev/null
fi fi
@@ -712,7 +712,7 @@ sockread() {
done done
#FIXME: cleanup, we have extra function for this now #FIXME: cleanup, we have extra function for this now
if ps $pid >/dev/null 2&>1; then if ps $pid 2&>1 >/dev/null ; then
# time's up and dd is still alive --> timeout # time's up and dd is still alive --> timeout
kill $pid kill $pid
wait $pid 2>/dev/null wait $pid 2>/dev/null
@@ -1460,7 +1460,7 @@ sockread_serverhello() {
[[ $maxsleep -le 0 ]] && break [[ $maxsleep -le 0 ]] && break
done done
if ps $pid >/dev/null 2>&1; then if ps $pid 2>&1 >/dev/null ; then
# time's up and dd is still alive --> timeout # time's up and dd is still alive --> timeout
kill $pid >&2 2>/dev/null kill $pid >&2 2>/dev/null
wait $pid 2>/dev/null wait $pid 2>/dev/null