Skip to content

Commit

Permalink
add check for broken OpenBSD fclose()
Browse files Browse the repository at this point in the history
  • Loading branch information
rofl0r committed Feb 4, 2016
1 parent a1c31e7 commit b64c89e
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
26 changes: 26 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,27 @@ check_compile() {
return $res
}

check_define() {
printf "checking whether \$CC defines %s ... " "$1"
local res=1
$CC $CPPFLAGS $CFLAGS -dM -E - </dev/null | grep "$1" >/dev/null && res=0
test x$res = x0 && printf "yes\n" || printf "no\n"
return $res
}

check_compile_run() {
printf "checking %s ... " "$1"
local tmp=$(mktemp)
printf "$2" > "$tmp".c
local res=0
$CC $CPPFLAGS $CFLAGS "$tmp".c -o "$tmp".out >/dev/null 2>&1 \
|| res=1
test x$res = x0 && { "$tmp".out || res=1 ; }
rm -f "$tmp".c "$tmp".o "$tmp".out
test x$res = x0 && printf "yes\n" || printf "no\n"
return $res
}

usage() {
echo "supported arguments"
echo "--prefix=/path default: $prefix"
Expand Down Expand Up @@ -111,6 +132,11 @@ check_compile 'whether netinet/in.h defines __u6_addr.__u6_addr16' \
'#include <netinet/in.h>\nint main(int a, char**c){struct in6_addr x={.s6_addr32[0]=a};return x.s6_addr16[0]; }'
}

check_define __OpenBSD__ && \
check_compile_run 'whether OpenBSDs fclose() (illegally) calls close()' \
'#include <stdio.h>\n#include<stdlib.h>\nint close(int x){exit(0);}int main(){fclose(stdin);return 1;}' && \
CPPFLAGS="$CPPFLAGS -DBROKEN_FCLOSE"

echo CC?=$CC>config.mak
[ -z "$CPPFLAGS" ] || echo CPPFLAGS?=$CPPFLAGS>>config.mak
[ -z "$CFLAGS" ] || echo USER_CFLAGS?=$CFLAGS>>config.mak
Expand Down
2 changes: 2 additions & 0 deletions src/libproxychains.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,9 @@ static void get_chain_data(proxy_data * pd, unsigned int *proxy_count, chain_typ
}
}
}
#ifndef BROKEN_FCLOSE
fclose(file);
#endif
if(!count) {
fprintf(stderr, "error: no valid proxy found in config\n");
exit(1);
Expand Down

0 comments on commit b64c89e

Please sign in to comment.