EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

escape all chars higher than 127 in debug output to <..> to avoid problems with unicode terminals

Browse Source
This commit is contained in:
zimoch
2018-06-18 17:51:36 +02:00
parent 710a442d31
commit 89d3801a5f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/StreamBuffer.cc
View File

@ -317,7 +317,7 @@ dump() const
for (i = 0; i < cap; i++) for (i = 0; i < cap; i++)
{ {
if (i == offs) result.append("\033[34m[\033[0m"); if (i == offs) result.append("\033[34m[\033[0m");
if ((buffer[i] & 0x7f) < 0x20 || (buffer[i] & 0x7f) == 0x7f) if (buffer[i] < 0x20 || buffer[i] >= 0x7f)
{ {
if (i < offs || i >= offs+len) if (i < offs || i >= offs+len)
result.print( result.print(

3
streamApp/tests/streamtestlib.tcl
View File

@ -61,6 +61,7 @@ proc startioc {} {
puts $fd "dbLoadDatabase ../O.Common/streamApp.dbd" puts $fd "dbLoadDatabase ../O.Common/streamApp.dbd"
puts $fd "streamApp_registerRecordDeviceDriver" puts $fd "streamApp_registerRecordDeviceDriver"
} }
puts $fd "streamSetLogfile StreamDebug.log"
puts $fd "epicsEnvSet STREAM_PROTOCOL_PATH ." puts $fd "epicsEnvSet STREAM_PROTOCOL_PATH ."
puts $fd "drvAsynIPPortConfigure device localhost:$port" puts $fd "drvAsynIPPortConfigure device localhost:$port"
puts $fd "dbLoadRecords test.db" puts $fd "dbLoadRecords test.db"
@ -172,7 +173,7 @@ proc escape {string} {
append result "\\r" append result "\\r"
} elseif {$n == 10} { } elseif {$n == 10} {
append result "\\n" append result "\\n"
} elseif {($n & 127) < 32} { } elseif {$n < 32 || $n >= 127} {
append result [format "<%02x>" $n] append result [format "<%02x>" $n]
} else { } else {
append result $c append result $c