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

Some minor non functional corrections

Browse source
This commit is contained in:
Gerhard Rieger 2021-10-24 09:39:35 +02:00
parent 29207daf38
commit 4cebaf45e4
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -67,6 +67,9 @@ Documentation:
Added missing closing parenthesis in socat.yo. Added missing closing parenthesis in socat.yo.
Thanks to Emanuele Torre for reporting this issue. Thanks to Emanuele Torre for reporting this issue.
Corrected more typos and added missing bug info to CHANGES, performed
some non functional corrections
####################### V 1.7.4.1: ####################### V 1.7.4.1:
Corrections: Corrections:
@ -135,6 +138,7 @@ Corrections:
packet. The fix makes RECVFROM drop the packet when the second address packet. The fix makes RECVFROM drop the packet when the second address
failed before reading it. Use retry or forever option with the second failed before reading it. Use retry or forever option with the second
address if you want to avoid data loss. address if you want to avoid data loss.
Fixes Red Hat bug 1907718
Thanks to Chunmei Xu for reporting this issue and proving the patch. Thanks to Chunmei Xu for reporting this issue and proving the patch.
Socats DTLS implementation has been reworked and appears to work now Socats DTLS implementation has been reworked and appears to work now
@ -179,7 +183,7 @@ Porting:
ai_protocol=0 and try again ai_protocol=0 and try again
Test: SCTP_SERVICENAME Test: SCTP_SERVICENAME
Per file filesystem options were still name ext2-* and depended on Per file filesystem options were still named ext2-* and depended on
<linux/ext2_fs.h>. Now they are called fs-* and depend on <linux/fs.h>. <linux/ext2_fs.h>. Now they are called fs-* and depend on <linux/fs.h>.
These fs-* options are also available on old systems with ext2_fs.h These fs-* options are also available on old systems with ext2_fs.h
@ -384,7 +388,7 @@ Corrections:
Print a useful error message when single character options appear to be Print a useful error message when single character options appear to be
merged in Socat invocation merged in Socat invocation
Test: SOCCAT_OPT_HINT Test: SOCAT_OPT_HINT
Fixed some docu typos. Fixed some docu typos.
Thanks to Travis Wellman, Thomas <tjps636>, Dan Kenigsberg, Thanks to Travis Wellman, Thomas <tjps636>, Dan Kenigsberg,

4
test.sh
View file

@ -5379,7 +5379,7 @@ mkfifo "$tpi"
touch "$tpo" touch "$tpo"
# #
# during development of this test, the following command line succeeded: # during development of this test, the following command line succeeded:
# (sleep 1; $ECHO "user\n\c"; sleep 1; $ECHO "password\c"; sleep 1; $ECHO "\n\c"; sleep 1; $ECHO "test 1\n\c"; sleep 1; $ECHO "\003\c"; sleep 1; $ECHO "test 2\n\c"; sleep 1; $ECHO "exit\n\c"; sleep 1) |$TRACE $SOCAT -d -d -d -d -lf/tmp/gerhard/debug1 -v -x - exec:'./readline.sh ./readline-test.sh',pty,ctty,setsid,raw,echo=0,isig # (sleep 1; $ECHO "user\n\c"; sleep 1; $ECHO "password\c"; sleep 1; $ECHO "\n\c"; sleep 1; $ECHO "test 1\n\c"; sleep 1; $ECHO "\003\c"; sleep 1; $ECHO "test 2\n\c"; sleep 1; $ECHO "exit\n\c"; sleep 1) |$TRACE $SOCAT -d -d -d -d -lf/tmp/$USER/debug1 -v -x - exec:'./readline.sh ./readline-test.sh',pty,ctty,setsid,raw,echo=0,isig
# #
PATH=${SOCAT%socat}:$PATH eval "$CMD 2>$te &" PATH=${SOCAT%socat}:$PATH eval "$CMD 2>$te &"
pid=$! # background process id pid=$! # background process id
@ -13925,7 +13925,7 @@ CMD="$TRACE $SOCAT $opts - $tf,o-direct,ignoreeof!!$tf"
echo "$da" |$CMD >"$to" 2>"$te" echo "$da" |$CMD >"$to" 2>"$te"
rc=$? rc=$?
if [ $rc -ne 0 ] && grep -q "Invalid argument" "$te" && [ $UNAME = Linux ]; then if [ $rc -ne 0 ] && grep -q "Invalid argument" "$te" && [ $UNAME = Linux ]; then
case $(stat -f /tmp/gerhard/ |grep -o "Type: [^[:space:]]*" |cut -c 7-) in case $(stat -f $tf |grep -o "Type: [^[:space:]]*" |cut -c 7-) in
ext2/ext3|xfs|reiserfs) ext2/ext3|xfs|reiserfs)
$PRINTF "${FAILED}\n" $PRINTF "${FAILED}\n"
echo "$CMD" >&2 echo "$CMD" >&2

2
vsnprintf_r.c
View file

@ -374,7 +374,7 @@ int vsnprintf_r(char *str, size_t size, const char *format, va_list ap) {
#if HAVE_TYPE_LONGLONG #if HAVE_TYPE_LONGLONG
# define num_buff_len ((sizeof(unsigned long long)*8+2)/3+1) /* hold up to u long long in octal w/ \0 */ # define num_buff_len ((sizeof(unsigned long long)*8+2)/3+1) /* hold up to u long long in octal w/ \0 */
#else #else
# define num_buff_len ((sizeof(unsigned long)*8+2)/3+1)]; /* hold up to u long in octal w/ \0 */ # define num_buff_len ((sizeof(unsigned long)*8+2)/3+1) /* hold up to u long in octal w/ \0 */
#endif #endif
char lengthmod = '\0'; /* 'h' 'l' 'L' 'z' */ char lengthmod = '\0'; /* 'h' 'l' 'L' 'z' */
int leading0 = 0; /* or 1 */ int leading0 = 0; /* or 1 */