bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-22 23:42:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor corrections, not affecting binaries

Browse source
This commit is contained in:
Gerhard Rieger 2020-01-05 16:00:17 +01:00
parent e310bb1cfd
commit 9de26f1d05
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES
View file

@ -89,6 +89,7 @@ Corrections:
name to decide if it is an IPv4 address. This was not RFC conform. This name to decide if it is an IPv4 address. This was not RFC conform. This
fix removes the possibility for use of IPv4 addresses with IPv6, e.g. fix removes the possibility for use of IPv4 addresses with IPv6, e.g.
TCP6:127.0.0.1:80 TCP6:127.0.0.1:80
Debian issue 695885
Thanks to Nicolas Fournil for reporting this issue. Thanks to Nicolas Fournil for reporting this issue.
Print a useful error message when single character options appear to be Print a useful error message when single character options appear to be

1
Makefile.in
View file

@ -49,7 +49,6 @@ XIOSRCS = xioinitialize.c xiohelp.c xioparam.c xiodiag.c xioopen.c xioopts.c \
xio-ip.c xio-ip4.c xio-ip6.c xio-ipapp.c xio-tcp.c \ xio-ip.c xio-ip4.c xio-ip6.c xio-ipapp.c xio-tcp.c \
xio-sctp.c xio-rawip.c \ xio-sctp.c xio-rawip.c \
xio-socks.c xio-proxy.c xio-udp.c \ xio-socks.c xio-proxy.c xio-udp.c \
xio-rawip.c \
xio-progcall.c xio-exec.c xio-system.c xio-termios.c xio-readline.c \ xio-progcall.c xio-exec.c xio-system.c xio-termios.c xio-readline.c \
xio-pty.c xio-openssl.c xio-streams.c\ xio-pty.c xio-openssl.c xio-streams.c\
xio-ascii.c xiolockfile.c xio-tcpwrap.c xio-ext2.c xio-tun.c xio-ascii.c xiolockfile.c xio-tcpwrap.c xio-ext2.c xio-tun.c

9
test.sh
View file

@ -183,7 +183,7 @@ if ! type usleep >/dev/null 2>&1 ||
fi fi
#USLEEP=usleep #USLEEP=usleep
if type ping6; then if type ping6 >/dev/null 2>&1; then
PING6=ping6 PING6=ping6
else else
PING6="ping -6" PING6="ping -6"
@ -13020,7 +13020,7 @@ N=$((N+1))
NAME=SOCAT_OPT_HINT NAME=SOCAT_OPT_HINT
case "$TESTS" in case "$TESTS" in
*%$N%*|*%socat%*|*%$NAME%*) *%$N%*|*%functions%*|*%$NAME%*)
TEST="$NAME: check if merging single character options is rejected" TEST="$NAME: check if merging single character options is rejected"
if ! eval $NUMCOND; then :; else if ! eval $NUMCOND; then :; else
te="$td/test$N.stderr" te="$td/test$N.stderr"
@ -13057,8 +13057,10 @@ te="$td/test$N.stderr"
tdiff="$td/test$N.diff" tdiff="$td/test$N.diff"
da="test$N $(date) $RANDOM" da="test$N $(date) $RANDOM"
CMD0="$TRACE $SOCAT $opts -T 1 STDIO,echo=0 EXEC:cat" CMD0="$TRACE $SOCAT $opts -T 1 STDIO,echo=0 EXEC:cat"
echo "$CMD0" >$td/test$N.sh
chmod a+x $td/test$N.sh
printf "test $F_n $TEST... " $N printf "test $F_n $TEST... " $N
$CMD0 2>"${te}0" $SOCAT /dev/null EXEC:$td/test$N.sh,pty 2>"${te}0"
rc0=$? rc0=$?
if [ $rc0 -eq 0 ]; then if [ $rc0 -eq 0 ]; then
$PRINTF "$OK\n" $PRINTF "$OK\n"
@ -13066,6 +13068,7 @@ if [ $rc0 -eq 0 ]; then
else else
$PRINTF "$FAILED\n" $PRINTF "$FAILED\n"
echo "$CMD0" echo "$CMD0"
cat "${te}0"
numFAIL=$((numFAIL+1)) numFAIL=$((numFAIL+1))
listFAIL="$listFAIL $N" listFAIL="$listFAIL $N"
fi fi