izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various fixes for Illumos Hipster 20151003.

Browse Source
This commit is contained in:
John Hood
2016-01-17 23:18:05 -05:00
parent dbbed24d83
commit 6fd570f81f
7 changed files with 62 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/crypto/byteorder.h
+10 -10
View File
@@ -72,14 +72,14 @@
inline uint64_t htobe64( uint64_t x ) {
uint8_t xs[ 8 ] = {
( x >> 56 ) & 0xFF,
( x >> 48 ) & 0xFF,
( x >> 40 ) & 0xFF,
( x >> 32 ) & 0xFF,
( x >> 24 ) & 0xFF,
( x >> 16 ) & 0xFF,
( x >> 8 ) & 0xFF,
x & 0xFF };
static_cast<uint8_t>( ( x >> 56 ) & 0xFF ),
static_cast<uint8_t>( ( x >> 48 ) & 0xFF ),
static_cast<uint8_t>( ( x >> 40 ) & 0xFF ),
static_cast<uint8_t>( ( x >> 32 ) & 0xFF ),
static_cast<uint8_t>( ( x >> 24 ) & 0xFF ),
static_cast<uint8_t>( ( x >> 16 ) & 0xFF ),
static_cast<uint8_t>( ( x >> 8 ) & 0xFF ),
static_cast<uint8_t>( ( x ) & 0xFF ) };
union {
const uint8_t *p8;
const uint64_t *p64;
@@ -106,8 +106,8 @@ inline uint64_t be64toh( uint64_t x ) {
inline uint16_t htobe16( uint16_t x ) {
uint8_t xs[ 2 ] = {
( x >> 8 ) & 0xFF,
x & 0xFF };
static_cast<uint8_t>( ( x >> 8 ) & 0xFF ),
static_cast<uint8_t>( ( x ) & 0xFF ) };
union {
const uint8_t *p8;
const uint16_t *p16;
src/crypto/crypto.cc
+3
View File
@@ -65,6 +65,9 @@ AlignedBuffer::AlignedBuffer( size_t len, const char *data )
: m_len( len ), m_allocated( NULL ), m_data( NULL )
{
#if defined(HAVE_POSIX_MEMALIGN)
if ( len == 0 ) {
len = 1;
}
if ( ( 0 != posix_memalign( &m_allocated, 16, len ) )
|| ( m_allocated == NULL ) ) {
throw std::bad_alloc();
src/tests/e2e-test
-3
View File
@@ -17,8 +17,6 @@ error()
dump_logs()
{
local dir
local testname
dir=$1
shift
testname=$(basename $dir .d)
@@ -60,7 +58,6 @@ test_exitstatus()
# Tmux check.
tmux_check()
{
local version version_major version_minor
version=$(tmux -V)
if [ $? != 0 ]; then
error "tmux unavailable\n"
src/tests/emulation-ascii-iso-8859.test
+16 -17
View File
@@ -63,23 +63,22 @@ chr()
utf8cp()
{
local c=$1
if [ $c -gt $((0x10ffff)) ]; then
fail "illegal Unicode code point %x\n" $c
elif [ $c -lt $((0x80)) ]; then
chr $c
elif [ $c -lt $((0x800)) ]; then
chr $(( (($c >> 6) & 0x1f) | 0xc0 ))
chr $(( ($c & 0x3f) | 0x80 ))
elif [ $c -lt $((0x10000)) ]; then
chr $(( (($c >> 12) & 0x0f) | 0xe0 ))
chr $(( (($c >> 6) & 0x3f) | 0x80 ))
chr $(( ($c & 0x3f) | 0x80 ))
elif [ $c -lt $((0x200000)) ]; then
chr $(( (($c >> 18) & 0x03) | 0xf0 ))
chr $(( (($c >> 12) & 0x3f) | 0x80 ))
chr $(( (($c >> 6) & 0x3f) | 0x80 ))
chr $(( ($c & 0x3f) | 0x80 ))
if [ $1 -gt $((0x10ffff)) ]; then
fail "illegal Unicode code point %x\n" $1
elif [ $1 -lt $((0x80)) ]; then
chr $1
elif [ $1 -lt $((0x800)) ]; then
chr $(( (($1 >> 6) & 0x1f) | 0xc0 ))
chr $(( ($1 & 0x3f) | 0x80 ))
elif [ $1 -lt $((0x10000)) ]; then
chr $(( (($1 >> 12) & 0x0f) | 0xe0 ))
chr $(( (($1 >> 6) & 0x3f) | 0x80 ))
chr $(( ($1 & 0x3f) | 0x80 ))
elif [ $1 -lt $((0x200000)) ]; then
chr $(( (($1 >> 18) & 0x03) | 0xf0 ))
chr $(( (($1 >> 12) & 0x3f) | 0x80 ))
chr $(( (($1 >> 6) & 0x3f) | 0x80 ))
chr $(( ($1 & 0x3f) | 0x80 ))
fi
}
src/tests/emulation-wrap-across-frames.test
+16 -17
View File
@@ -68,23 +68,22 @@ chr()
utf8cp()
{
local c=$1
if [ $c -gt $((0x10ffff)) ]; then
fail "illegal Unicode code point %x\n" $c
elif [ $c -lt $((0x80)) ]; then
chr $c
elif [ $c -lt $((0x800)) ]; then
chr $(( (($c >> 6) & 0x1f) | 0xc0 ))
chr $(( ($c & 0x3f) | 0x80 ))
elif [ $c -lt $((0x10000)) ]; then
chr $(( (($c >> 12) & 0x0f) | 0xe0 ))
chr $(( (($c >> 6) & 0x3f) | 0x80 ))
chr $(( ($c & 0x3f) | 0x80 ))
elif [ $c -lt $((0x200000)) ]; then
chr $(( (($c >> 18) & 0x03) | 0xf0 ))
chr $(( (($c >> 12) & 0x3f) | 0x80 ))
chr $(( (($c >> 6) & 0x3f) | 0x80 ))
chr $(( ($c & 0x3f) | 0x80 ))
if [ $1 -gt $((0x10ffff)) ]; then
fail "illegal Unicode code point %x\n" $1
elif [ $1 -lt $((0x80)) ]; then
chr $1
elif [ $1 -lt $((0x800)) ]; then
chr $(( (($1 >> 6) & 0x1f) | 0xc0 ))
chr $(( ($1 & 0x3f) | 0x80 ))
elif [ $1 -lt $((0x10000)) ]; then
chr $(( (($1 >> 12) & 0x0f) | 0xe0 ))
chr $(( (($1 >> 6) & 0x3f) | 0x80 ))
chr $(( ($1 & 0x3f) | 0x80 ))
elif [ $1 -lt $((0x200000)) ]; then
chr $(( (($1 >> 18) & 0x03) | 0xf0 ))
chr $(( (($1 >> 12) & 0x3f) | 0x80 ))
chr $(( (($1 >> 6) & 0x3f) | 0x80 ))
chr $(( ($1 & 0x3f) | 0x80 ))
fi
}
src/tests/prediction-unicode.test
+16 -17
View File
@@ -79,23 +79,22 @@ chr()
utf8cp()
{
local c=$1
if [ $c -gt $((0x10ffff)) ]; then
fail "illegal Unicode code point %x\n" $c
elif [ $c -lt $((0x80)) ]; then
chr $c
elif [ $c -lt $((0x800)) ]; then
chr $(( (($c >> 6) & 0x1f) | 0xc0 ))
chr $(( ($c & 0x3f) | 0x80 ))
elif [ $c -lt $((0x10000)) ]; then
chr $(( (($c >> 12) & 0x0f) | 0xe0 ))
chr $(( (($c >> 6) & 0x3f) | 0x80 ))
chr $(( ($c & 0x3f) | 0x80 ))
elif [ $c -lt $((0x200000)) ]; then
chr $(( (($c >> 18) & 0x03) | 0xf0 ))
chr $(( (($c >> 12) & 0x3f) | 0x80 ))
chr $(( (($c >> 6) & 0x3f) | 0x80 ))
chr $(( ($c & 0x3f) | 0x80 ))
if [ $1 -gt $((0x10ffff)) ]; then
fail "illegal Unicode code point %x\n" $1
elif [ $1 -lt $((0x80)) ]; then
chr $1
elif [ $1 -lt $((0x800)) ]; then
chr $(( (($1 >> 6) & 0x1f) | 0xc0 ))
chr $(( ($1 & 0x3f) | 0x80 ))
elif [ $1 -lt $((0x10000)) ]; then
chr $(( (($1 >> 12) & 0x0f) | 0xe0 ))
chr $(( (($1 >> 6) & 0x3f) | 0x80 ))
chr $(( ($1 & 0x3f) | 0x80 ))
elif [ $1 -lt $((0x200000)) ]; then
chr $(( (($1 >> 18) & 0x03) | 0xf0 ))
chr $(( (($1 >> 12) & 0x3f) | 0x80 ))
chr $(( (($1 >> 6) & 0x3f) | 0x80 ))
chr $(( ($1 & 0x3f) | 0x80 ))
fi
}
src/tests/server-network-timeout.test
+1 -1
View File
@@ -48,7 +48,7 @@ client()
case $retval in
0|1)
fail "mosh-client had a normal exit\n";; # test condition failed
137)
9|137|265)
# Aha, signal 9. Wait.
sleep $(( $TIMEOUT + 12 ))
exit 0