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

Browse source
This commit is contained in:
Gerhard Rieger 2021-10-31 18:43:00 +01:00
parent de80e962a6
commit f820690967
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
filan.c
View file

@ -911,7 +911,7 @@ int tcpan2(int fd, FILE *outfile) {
result = Getsockopt(fd, SOL_TCP, TCP_INFO, &tcpinfo, &tcpinfolen); result = Getsockopt(fd, SOL_TCP, TCP_INFO, &tcpinfo, &tcpinfolen);
if (result < 0) { if (result < 0) {
Debug4("getsockopt(%d, SOL_TCP, TCP_INFO, %p, {"F_socklen"}): %s", Debug4("getsockopt(%d, SOL_TCP, TCP_INFO, %p, {"F_Zu"}): %s",
fd, &tcpinfo, sizeof(tcpinfo), strerror(errno)); fd, &tcpinfo, sizeof(tcpinfo), strerror(errno));
return -1; return -1;
} }

8
test.sh
View file

@ -15340,15 +15340,7 @@ rc1=$?
kill $pid0 2>/dev/null; wait kill $pid0 2>/dev/null; wait
if [ !!! ]; then if [ !!! ]; then
$PRINTF "$OK\n" $PRINTF "$OK\n"
<<<<<<< HEAD
<<<<<<< HEAD
if [" $VERBOSE" ]; then
=======
if [ "$VERBOSE" ]; then if [ "$VERBOSE" ]; then
>>>>>>> 8e56329... ABSTEACT-LISTEN with option user calls fchown()
=======
if [ "$VERBOSE" ]; then
>>>>>>> 4927d33... Option -R did not only dump right-to-left, but also left-to-right traffic
echo "$CMD0 &" >&2 echo "$CMD0 &" >&2
echo "$CMD1" >&2 echo "$CMD1" >&2
fi fi