version updated

added missing output convertion from ULONG in waveform record
fix bug that leads to infinite callback loop when first command (typically 'out') fails
2018-07-12 16:16:34 +02:00 · 2018-07-12 16:11:38 +02:00 · 2018-07-12 16:07:48 +02:00 · 2018-07-11 18:00:08 +02:00 · 2018-07-10 11:08:36 +02:00 · 2018-07-06 17:03:40 +02:00
75 changed files with 1121 additions and 517 deletions
--- a/16
+++ b/16
@ -1,12 +1,11 @@
 # Remove this file if not using the PSI build system
 include /ioc/tools/driver.makefile
 EXCLUDE_VERSIONS = 3.13.2
-PROJECT=stream2
+PROJECT=stream
 BUILDCLASSES += Linux
 #DOCUDIR = doc
 DBDS = stream.dbd
 BUSSES  += AsynDriver
 BUSSES  += Dummy
@ -41,18 +40,17 @@ HEADERS += StreamFormatConverter.h
 HEADERS += StreamBuffer.h
 HEADERS += StreamError.h
-ifeq (${EPICS_BASETYPE},3.13)
+ifneq (${EPICS_BASETYPE},3.13)
 USR_INCLUDES += -include $(INSTALL_INCLUDE)/compat3_13.h
 endif
 ifeq (${EPICS_BASETYPE},3.14)
 RECORDTYPES += calcout
 endif
-StreamCore.o: streamReferences
+StreamCore.o StreamCore.d: streamReferences
 streamReferences:
 	perl ../src/makeref.pl Interface $(BUSSES) > $@
 	perl ../src/makeref.pl Converter $(FORMATS) >> $@
-stream.dbd:
+export DBDFILES = streamSup.dbd
 streamSup.dbd:
 	@echo Creating $@
 	perl ../src/makedbd.pl $(RECORDTYPES) > $@
--- a/5
+++ b/5
@ -1,5 +0,0 @@
 # Please change the following email with yours.
 Email:  dirk.zimoch@psi.ch
 Module-Name: StreamDevice2
 Description: StreamDevice2 
 Project-Name:
--- a/doc/PSI.gif
+++ b/doc/PSI.gif
--- a/doc/PSI.png
+++ b/doc/PSI.png
--- a/doc/aai.html
+++ b/doc/aai.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: aai Records</h1>
+<h1>aai Records</h1>
 <p>
 <b>Note:</b> aai record support is disabled per default.
 Enable it in <code>src/CONFIG_STREAM</code>.
--- a/doc/aao.html
+++ b/doc/aao.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: aao Records</h1>
+<h1>aao Records</h1>
 <p>
 <b>Note:</b> aao record support is disabled per default.
 Enable it in <code>src/CONFIG_STREAM</code>.
--- a/doc/ai.html
+++ b/doc/ai.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: ai Records</h1>
+<h1>ai Records</h1>
 <h2>Normal Operation</h2>
 <p>
@ -41,6 +41,12 @@ written or read value.
   (=20.0/0xFFFF) maps 0x0000 to -10.0, 0x7FFF to 0.0 and 0xFFFF to 10.0.
   Using unsigned formats with values &ge; 0x800000 gives different results
   on 64 bit machines.
   <p>
   If <code>LINR=="NO CONVERSION"</code> (the default), <code>VAL</code>
   is directly converted from and to <code>long</code> without going through
   <code>RVAL</code>. This allows for more bits on 64 bit machines.
   To get the old behavior, use <code>LINR=="LINEAR"</code>.
   </p>
  </dd>
 <dt>ENUM format (e.g. <code>%{</code>):</dt>
  <dd>
@ -78,6 +84,6 @@ written or read value.
 <a href="calcout.html">calcout</a>
 <a href="scalcout.html">scalcout</a>
 </p>
-<p><small>Dirk Zimoch, 2005</small></p>
+<p><small>Dirk Zimoch, 2015</small></p>
 </body>
 </html>
--- a/doc/ao.html
+++ b/doc/ao.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: ao Records</h1>
+<h1>ao Records</h1>
 <h2>Normal Operation</h2>
 <p>
@ -40,6 +40,12 @@ written or read value.
   (=20.0/0xFFFF) maps -10.0 to 0x0000, 0.0 to 0x7FFF and 10.0 to 0xFFFF.
   Using unsigned formats with values &ge; 0x800000 gives different results
   on 64 bit machines.
   <p>
   If <code>LINR=="NO CONVERSION"</code> (the default), <code>OVAL</code>
   is directly converted to <code>long</code> without going through
   <code>RVAL</code>. This allows for more bits on 64 bit machines.
   To get the old behavior, use <code>LINR=="LINEAR"</code>.
   </p>
  </dd>
 <dt>ENUM format (e.g. <code>%{</code>):</dt>
  <dd>
@ -79,6 +85,6 @@ written or read value.
 <a href="calcout.html">calcout</a>
 <a href="scalcout.html">scalcout</a>
 </p>
-<p><small>Dirk Zimoch, 2005</small></p>
+<p><small>Dirk Zimoch, 2015</small></p>
 </body>
 </html>
--- a/doc/bi.html
+++ b/doc/bi.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: bi Records</h1>
+<h1>bi Records</h1>
 <h2>Normal Operation</h2>
 <p>
--- a/doc/bo.html
+++ b/doc/bo.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: bo Records</h1>
+<h1>bo Records</h1>
 <h2>Normal Operation</h2>
 <p>
--- a/doc/calcout.html
+++ b/doc/calcout.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: calcout Records</h1>
+<h1>calcout Records</h1>
 <p>
 <b>Note:</b> Device support for calcout records is only available for
--- a/doc/epics3_13.html
+++ b/doc/epics3_13.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Using EPICS 3.13</h1>
+<h1>Using EPICS 3.13</h1>
 <a name="pre"></a>
 <h2>1. Prerequisites</h2>
--- a/doc/formatconverter.html
+++ b/doc/formatconverter.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Format Converter API</h1>
+<h1>Format Converter API</h1>
 <a name="class"></a>
 <h2>Converter Class</h2>
--- a/doc/formats.html
+++ b/doc/formats.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Format Converters</h1>
+<h1>Format Converters</h1>
 <a name="syntax"></a>
 <h2>1. Format Syntax</h2>
@ -28,8 +28,8 @@ A format converter consists of
 </p>
 <ul>
 <li>The <code>%</code> character</li>
- <li>Optionally a field <span class="new">or record</span> name in <code>()</code></li>
+ <li>Optionally a field or record name in <code>()</code></li>
- <li>Optionally flags out of the characters <code>*# +0-<span class="new">?=</span></code></li>
+ <li>Optionally flags out of the characters <code>*# +0-?=!</code></li>
 <li>Optionally an integer <em>width</em> field</li>
 <li>Optionally a period character (<code>.</code>) followed
     by an integer <em>precision</em> field (input ony for most formats)</li>
@ -40,7 +40,7 @@ A format converter consists of
 <p>
 The flags <code>*# +0-</code> work like in the C functions
 <em>printf()</em> and <em>scanf()</em>.
-The flags <code>?</code> and <code>=</code> are extensions.
+The flags <code>?</code>, <code>=</code> and <code>!</code> are extensions.
 </p>
 <p>
 The <code>*</code> flag skips data in input formats.
@ -67,16 +67,24 @@ The <code>0</code> flag says that numbers should be left padded with
 The <code>-</code> flag specifies that output is left justified if
 <em>width</em> is larger than required.
 </p>
-<p class="new">
+<p>
 The <code>?</code> flag makes failing input conversions succeed with
 a default zero value (0, 0.0, or "", depending on the format type).
 </p>
-<p class="new">
+<p>
 The <code>=</code> flag allows to compare input with current values.
 It is only allowed in input formats.
 Instead of reading a new value from input, the current value is
 formatted (like for output) and then compared to the input.
 </p>
 <p>
 The <code>!</code> flag demands that input is exactly <em>width</em>
 bytes long (normally <em>width</em> defines the maximum number of
 bytes read in many formats).
 For example <code>in "%!5d";</code> expects exactly 5 digits.
 Fewer digits are considered loss of data and make the format fail.
 This feature has been added by Klemen Vodopivec, SNS.
 </p>
 <h3>Examples:</h3>
 <table>
@ -143,11 +151,8 @@ field formatted as a string.
 Use <code>in&nbsp;"%(<i>otherrecord</i>.RVAL)f";</code> to write the floating
 point input value into the <code>RVAL</code> field of
 <code><i>otherrecord</i></code>. 
 <span class="new">
 If no field is given for an other record .VAL is assumed.
 When a record name conflicts with a field name use .VAL explicitly.
 </span>
 </p>
 <p>
 This feature is very useful when one line of input contains many values that should
@ -158,6 +163,9 @@ attribute (see
 target="ex">Record Reference Manual</a>), the record will be processed.
 It is your responsibility that the data type of the record field is
 compatible to the the data type of the converter.
 STRING formats are compatible with arrays of CHAR or UCHAR.
 </p>
 <p>
 Note that using this syntax is by far not as efficient as using the
 default field.
 At the moment it is not possible to set <code>otherrecord</code> to an alarm
@ -189,13 +197,13 @@ With the <code>#</code> flag, output always contains a period character.
 <p>
 <b>Input:</b> All these formats are equivalent. Leading whitespaces are skipped.
 </p>
-<p class="new">
+<p>
 With the <code>#</code> flag additional whitespace between sign and number
 is accepted.
 </p>
-<p class="new">
+<p>
 When a maximum field width is given, leading whitespace only counts to the
-field witdth when the space flag is given.
+field witdth when the space flag is used.
 </p>
 <a name="stdl"></a>
@ -210,6 +218,10 @@ field witdth when the space flag is given.
 <p>
 With the <code>#</code> flag, octal values are prefixed with <code>0</code>
 and hexadecimal values with <code>0x</code> or <code>0X</code>.
 <p>
 Unlike printf, <code>%x</code> and <code>%X</code> truncate the
 output to the the given width (number of least significant half bytes).
 </p>
 </p>
 <p>
 <b>Input:</b> <code>%d</code> matches signed decimal, <code>%u</code> matches
@ -221,16 +233,16 @@ Octal and hexadecimal values can optionally be prefixed.
 hexadecimal notation.
 Leading whitespaces are skipped.
 </p>
-<p class="new">
+<p>
 With the <code>-</code> negative octal and hexadecimal values are accepted. 
 </p>
-<p class="new">
+<p>
 With the <code>#</code> flag additional whitespace between sign and number
 is accepted.
 </p>
-<p class="new">
+<p>
 When a maximum field width is given, leading whitespace only counts to the
-field witdth when the space flag is given.
+field witdth when the space flag is used.
 </p>
 <a name="stds"></a>
@ -246,13 +258,11 @@ and <code>%c</code> matches a sequence of not-null characters.
 The maximum string length is given by <em>width</em>.
 The default <em>width</em> is infinite for <code>%s</code> and
 1 for <code>%c</code>.
-Leading whitespaces are skipped with <code>%s</code> 
+Leading whitespaces are skipped with <code>%s</code> except when
-<span class="new">
+the space flag is used but not with <code>%c</code>.
 except when the space flag is given</span>
 but not with <code>%c</code>.
 The empty string matches.
 </p>
-<p class="new">
+<p>
 With the <code>#</code> flag <code>%s</code> matches a sequence of not-null
 characters instead of non-whitespace characters.
 </p>
@ -286,9 +296,20 @@ to the value 0, <code>STANDBY</code> to 1 and <code>ON</code> to 2.
 <p>
 When using the <code>#</code> flag it is allowed to assign integer values
 to the strings using <code>=</code>.
 Unassigned strings increment their values by 1 as usual.
 </p>
 <p>
-Example: <code>%#{neg=-1|stop=0|pos=1|fast=10}</code>.
+If one string is the initial substing of another, the substing must come
 later to ensure correct matching.
 In particular if one string is the emptry string, it must be the last one.
 Use <code>#</code> and <code>=</code> to renumber if necessary.
 </p>
 <p>
 Use the assignment <code>=?</code> for the last string to make it the
 default value for output formats.
 </p>
 <p>
 Example: <code>%#{neg=-1|stop|pos|fast=10|rewind=-10}</code>.
 </p>
 <p>
 If one of the strings contains <code>|</code> or <code>}</code>
@ -296,10 +317,11 @@ If one of the strings contains <code>|</code> or <code>}</code>
 a <code>\</code> must be used to escape the character.
 </p>
 <p>
-In output, depending on the value, one of the strings is printed.
+<b>Output:</b> Depending on the value, one of the strings is printed,
 or the default if no value matches.
 </p>
 <p>
-In input, if any of the strings matches the value is set accordingly.
+<b>Input:</b> If any of the strings matches, the value is set accordingly.
 </p>
 <a name="bin"></a>
@ -345,9 +367,12 @@ endian</em>, i.e. least significant byte first.
 With the <code>0</code> flag, the value is unsigned, otherwise signed.
 </p>
 <p>
-In output, the <em>prec</em> (or sizeof(long) whatever is less) least
+In output, the <em>precision</em> (or sizeof(long) whatever is less) least
 significant bytes of the value are sign extended or zero extended
 (depending on the <code>0</code> flag) to <em>width</em> bytes.
 The default for <em>precision</em> is 1. Thus if you do not specify
 the <em>precision</em>, only the least significant byte is written!
 It is common error to write <code>out "%2r";</code> instead of <code>out "%.2r";</code>.
 </p>
 <p>
 In input, <em>width</em> bytes are read and put into the value.
@ -358,7 +383,7 @@ the value is sign extended or zero extended, depending on the
 <code>0</code> flag.
 </p>
 <p>
-Example: <code>out "%.2r"</code>
+Examples: <code>out "%.2r"; in "%02r";</code>
 </p>
 <a name="rawdouble"></a>
@ -412,7 +437,7 @@ The <em>width</em> field is the byte number from which to start
 calculating the checksum.
 Default is 0, i.e. the first byte of the input or output of the current
 command.
-The last byte is <em>prec</em> bytes before the checksum (default 0).
+The last byte is <em>precision</em> bytes before the checksum (default 0).
 For example in <code>"abcdefg%&lt;xor&gt;"</code> the checksum is calculated
 from <code>abcdefg</code>,
 but in <code>"abcdefg%2.1&lt;xor&gt;"</code> only from <code>cdef</code>.
@ -466,21 +491,24 @@ In input, the next byte or bytes must match the checksum.
  (poly=0x07, init=0x00, xorout=0x00).</dd>
 <dt><code>%&lt;ccitt8&gt;</code></dt>
  <dd>One byte. The CCITT standard 8 bit crc checksum
-  (poly=0x31, init=0x00, xorout=0x00).</dd>
+  (poly=0x31, init=0x00, xorout=0x00, reflected).</dd>
 <dt><code>%&lt;crc16&gt;</code></dt>
  <dd>Two bytes. An often used 16 bit crc checksum
  (poly=0x8005, init=0x0000, xorout=0x0000).</dd>
 <dt><code>%&lt;crc16r&gt;</code></dt>
  <dd>Two bytes. An often used reflected 16 bit crc checksum
-  (poly=0x8005, init=0x0000, xorout=0x0000).</dd>
+  (poly=0x8005, init=0x0000, xorout=0x0000, reflected).</dd>
 <dt><code>%&lt;modbus&gt;</code></dt>
  <dd>Two bytes. The modbus 16 bit crc checksum
  (poly=0x8005, init=0xffff, xorout=0x0000, reflected)</dd>
 <dt><code>%&lt;ccitt16&gt;</code></dt>
  <dd>Two bytes. The usual (but <a target="ex"
-   href="http://www.joegeluso.com/software/articles/ccitt.htm">wrong?</a>)
+   href="http://srecord.sourceforge.net/crc16-ccitt.html">wrong?</a>)
   implementation of the CCITT standard 16 bit crc checksum
   (poly=0x1021, init=0xFFFF, xorout=0x0000).</dd>
 <dt><code>%&lt;ccitt16a&gt;</code></dt>
  <dd>Two bytes. The unusual (but <a target="ex"
-   href="http://www.joegeluso.com/software/articles/ccitt.htm">correct?</a>)
+   href="http://srecord.sourceforge.net/crc16-ccitt.html">correct?</a>)
   implementation of the CCITT standard 16 bit crc checksum with augment.
   (poly=0x1021, init=0x1D0F, xorout=0x0000).</dd>
 <dt><code>%&lt;ccitt16x&gt;</code> or <code>%&lt;crc16c&gt;</code> or <code>%&lt;xmodem&gt;</code></dt>
@ -491,10 +519,10 @@ In input, the next byte or bytes must match the checksum.
   (poly=0x04C11DB7, init=0xFFFFFFFF, xorout=0xFFFFFFFF).</dd>
 <dt><code>%&lt;crc32r&gt;</code></dt>
  <dd>Four bytes. The standard reflected 32 bit crc checksum.
-   (poly=0x04C11DB7, init=0xFFFFFFFF, xorout=0xFFFFFFFF).</dd>
+   (poly=0x04C11DB7, init=0xFFFFFFFF, xorout=0xFFFFFFFF, reflected).</dd>
 <dt><code>%&lt;jamcrc&gt;</code></dt>
  <dd>Four bytes. Another reflected 32 bit crc checksum.
-   (poly=0x04C11DB7, init=0xFFFFFFFF, xorout=0x00000000).</dd>
+   (poly=0x04C11DB7, init=0xFFFFFFFF, xorout=0x00000000, reflected).</dd>
 <dt><code>%&lt;adler32&gt;</code></dt>
  <dd>Four bytes. The Adler32 checksum according to <a target="ex"
   href="http://www.ietf.org/rfc/rfc1950.txt">RFC 1950</a>.</dd>
@ -503,41 +531,44 @@ In input, the next byte or bytes must match the checksum.
 </dl>
 <a name="regex"></a>
-<h2>12. Regular Expresion STRING Converter (<code>%/<em>regex</em>/</code>)</h2>
+<h2>13. Regular Expresion STRING Converter (<code>%/<em>regex</em>/</code>)</h2>
 <p>
 This input-only format matches <a target="ex"
 href="http://www.pcre.org/" >Perl compatible regular expressions (PCRE)</a>.
 It is only available if a PCRE library is installed.
 </p>
 <div class="box">
 <p>
 If PCRE is not available for your host or cross architecture, download
 the sourcecode from <a target="ex" href="http://www.pcre.org/">www.pcre.org</a>
 and try my EPICS compatible <a target="ex"
 href="http://epics.web.psi.ch/software/streamdevice/pcre/Makefile">Makefile</a>
-to compile it like a normal EPICS application.
+to compile it like a normal EPICS support module.
 The Makefile is known to work with EPICS 3.14.8 and PCRE 7.2.
 In your RELEASE file define the variable <code>PCRE</code> so that
 it points to the install location of PCRE.
 </p>
 <p>
-If PCRE is already installed on your system, use the variables
+If PCRE is already installed on (some of) your systems, you may add
-<code>PCRE_INCLUDE</code> and <code>PCRE_LIB</code> instead to provide
+architectures where PCRE can be found in standard include and library
-the install directories of <code>pcre.h</code> and the library.
+locations to the variable <code>WITH_SYSTEM_PCRE</code>.
-</p>
+If either the header file or the library are in a non-standard place,
-<p>
+set in your RELEASE file the variables <code>PCRE_INCLUDE_<em>arch</em></code>
-If you have PCRE installed in different locations for different (cross)
+and/or <code>PCRE_LIB_<em>arch</em></code> for the respective architectures
-architectures, define the variables in RELEASE.Common.&lt;architecture&gt;
+to the correct directories or set
-instead of the global RELEASE file.
+<code>PCRE_INCLUDE</code> and/or <code>PCRE_LIB</code>
 in architecture specific RELEASE.Common.<em>arch</em> files.
 </p>
 </div>
 <p>
 If the regular expression is not anchored, i.e. does not start with
 <code>^</code>, leading non-matching input is skipped. 
 A maximum of <em>width</em> bytes is matched, if specified.
-If <em>prec</em> is given, it specifies the sub-expression whose match
+If <em>precision</em> is given, it specifies the sub-expression in <code>()</code>
-is retuned.
+whose match is retuned.
 Otherwise the complete match is returned.
 In any case, the complete match is consumed from the input buffer.
-If the expression contains a <code>/</code> it must be escaped.
+If the expression contains a <code>/</code> it must be escaped like <code>\/</code>.
 </p>
 <p>
 Example: <code>%.1/&lt;title&gt;(.*)&lt;\/title&gt;/</code> returns
@ -545,8 +576,81 @@ the title of an HTML page, skipps anything before the
 <code>&lt;title&gt</code> tag and leaves anything after the
 <code>&lt;/title&gt;</code> tag in the input buffer.
 </p>
 <a name="regsub"></a>
 <h2>14. Regular Expresion Substitution Pseudo-Converter (<code>%#/<em>regex</em>/<em>subst</em>/</code>)</h2>
 <p>
 This is a variant of the previous converter (note the <code>#</code>)
 but instead of returning the matching string,
 it can be used as a pre-processor for input or
 as a post-processor for output.
 </p>
 <p>
 Matches of the <em>regex</em> are replaced by the string <em>subst</em> with all
 <code>&</code> in <em>subst</em> replaced with the match itself and all
 <code>\1</code> through <code>\9</code> replaced with the match of the corresponding
 sub-expression <span class="new"> if such a sub-expression exists.
 Due to limitations of the parser, <code>\1</code> and <code>\x01</code> are the same 
 which makes it difficult to use literal bytes with values lower than 10 in <em>subst</em>.
 Therefore <code>\0</code> aways means a literal byte (incompatible change from earlier version!)
 and <code>\1</code> through <code>\9</code> mean literal bytes if they are larger than
 the number of sub-expressions.
 </span>
 To get a literal <code>&</code> or <code>\</code> or <code>/</code> in the substitution write
 <code>\&</code> or <code>\\</code> or <code>\/</code>.
 </p>
 <p>
 If <em>width</em> is specified, it limits the number of characters processed.
 If the <code>-</code> flag is used (i.e. <em>width</em> looks like a negative number)
 only the last <em>width</em> characters are processed, else the first.
 Without <em>width</em> (or 0) all available characters are processed.
 </p>
 <p>
 If <em>precision</em> is specified, it indicates which matches to replace.
 With the <code>+</code> flag given, <em>precision</em> is the maximum
 number of matches to replace.
 Otherwise <em>precision</em> is the index (counting from 1) of the match to replace. 
 Without <em>precision</em> (or 0), all matches are replaced.
 </p>
 <p>
 In input this converter pre-processes data received from the device before
 following converters read it.
 Converters preceding this one will read unmodified input.
 Thus place this converter before those whose input should be pre-processed.
 </p>
 <p>
 In output it post-processes data already formatted by preceding converters
 before sending it to the device.
 Converters following this one will send their output unmodified.
 Thus place this converter after those whose output should be post-processed.
 </p>
 <p>
 Examples:
 <div class="indent">
 <code>%#+-10.2/ab/X/</code> replaces the string <code>ab</code> with <code>X</code>
 maximal 2 times in the last 10 characters.
 (<code>abcabcabcabc</code> becomes <code>abcXcXcabc</code>)
 </div>
 <div class="indent">
 <code>%#/\\/\//</code> replaces all <code>\</code> with <code>/</code>
 (<code>\dir\file</code> becomes <code>/dir/file</code>)
 </div>
 <div class="indent">
 <code>%#/..\B/&:/</code> inserts <code>:</code> after every second character
 which is not at the end of a word.
 (<code>0b19353134</code> becomes <code>0b:19:35:31:34</code>)
 </div>
 <div class="indent">
 <code>%#/://</code> removes all <code>:</code> characters.
 (<code>0b:19:35:31:34</code> becomes <code>0b19353134</code>)
 </div>
 <div class="indent">
 <code>%#/([^+-])*([+-])/\2\1/</code> moves a postfix sign to the front.
 (<code>1.23-</code> becomes <code>-1.23</code>)<br>
 </div>
 <a name="mantexp"></a>
-<h2>13. MantissaExponent DOUBLE converter (<code>%m</code>)</h2>
+<h2>15. MantissaExponent DOUBLE converter (<code>%m</code>)</h2>
 <p>
 This exotic and experimental format matches numbers in the format
 <i>[sign] mantissa sign exponent</i>, e.g <code>+123-4</code> meaning
@ -565,9 +669,8 @@ Format flags <code>+</code>, <code>-</code>, and space are supported in
 the usual way (always sign, left justified, space instead of + sign).
 Flags <code>#</code> and <code>0</code> are unsupported.
 </p>
 <div class="new">
 <a name="timestamp"></a>
-<h2>14. Timestamp DOUBLE converter (<code>%T(<em>timeformat</em>)</code>)</h2>
+<h2>16. Timestamp DOUBLE converter (<code>%T(<em>timeformat</em>)</code>)</h2>
 <p>
 This format reads or writes timestamps and converts them to a double number.
 The value represents the number of seconds since 1970 (the UNIX epoch).
@ -604,7 +707,7 @@ In output, the system function <em>strftime()</em> is used to format the time.
 There may be differences in the implementation between operating systems.
 </p>
 <p>
-In input, <em>StreamDevice</em> used its own implementation because many
+In input, <em>StreamDevice</em> uses its own implementation because many
 systems are missing the <em>strptime()</em> function and additional formats
 are supported.
 </p>
@ -618,9 +721,8 @@ Because of the complexity of the problem, locales are not supported.
 Thus, only the English month names can be used (week day names are
 ignored anyway).
 </p>
 </div>
 <hr>
 <p align="right"><a href="processing.html">Next: Record Processing</a></p>
-<p><small>Dirk Zimoch, 2011</small></p>
+<p><small>Dirk Zimoch, 2015</small></p>
 </body>
 </html>
--- a/doc/index.html
+++ b/doc/index.html
@ -104,13 +104,8 @@ This marks text you typically type in configuration files etc.
 <pre>
 Longer code segments are often set in a box.
 </pre>
 <p>
 Important modifications and new features are
 <span class="new">highlighted with a yellow background</span>.
 Obsolete features are <strike class="new">highlighted and crossed out</strike>.
 </p>
 <hr>
 <p align="right"><a href="setup.html">Next: Setup</a></p>
-<p><small>Dirk Zimoch, 2011</small></p>
+<p><small>Dirk Zimoch, 2015</small></p>
 </body>
 </html>
--- a/doc/longin.html
+++ b/doc/longin.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: longin Records</h1>
+<h1>longin Records</h1>
 <h2>Normal Operation</h2>
 <p>
--- a/doc/longout.html
+++ b/doc/longout.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: longout Records</h1>
+<h1>longout Records</h1>
 <h2>Normal Operation</h2>
 <p>
--- a/doc/makepdf
+++ b/doc/makepdf
@ -0,0 +1,35 @@
 PAGES="
 index.html
 setup.html
 epics3_13.html
 protocol.html
 formats.html
 processing.html
 recordtypes.html
 aai.html
 aao.html
 ai.html
 ao.html
 bi.html
 bo.html
 mbbi.html
 mbbo.html
 mbbiDirect.html
 mbboDirect.html
 stringin.html
 stringout.html
 longin.html
 longout.html
 waveform.html
 calcout.html
 scalcout.html
 tipsandtricks.html
 recordinterface.html
 businterface.html
 formatconverter.html
 osinterface.html
 "
 rm -f stream.pdf
 wkhtmltopdf --print-media-type --dpi 1200 --zoom 0.85 --page-size Letter \
 $PAGES stream.pdf
--- a/doc/mbbi.html
+++ b/doc/mbbi.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: mbbi Records</h1>
+<h1>mbbi Records</h1>
 <h2>Normal Operation</h2>
 <p>
--- a/doc/mbbiDirect.html
+++ b/doc/mbbiDirect.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: mbbiDirect Records</h1>
+<h1>mbbiDirect Records</h1>
 <h2>Normal Operation</h2>
 <p>
--- a/doc/mbbo.html
+++ b/doc/mbbo.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: mbbo Records</h1>
+<h1>mbbo Records</h1>
 <h2>Normal Operation</h2>
 <p>
--- a/doc/mbboDirect.html
+++ b/doc/mbboDirect.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: mbboDirect Records</h1>
+<h1>mbboDirect Records</h1>
 <h2>Normal Operation</h2>
 <p>
--- a/doc/nav.html
+++ b/doc/nav.html
@ -132,6 +132,7 @@ div div div a {list-style-type:circle;}
  <a target="_parent" href="formats.html#bcd"       title="Binary coded decimal LONG converter">%D</a>
  <a target="_parent" href="formats.html#chksum"    title="Checksum pseudo converter">%&lt;<em>checksum</em>&gt;</a>
  <a target="_parent" href="formats.html#regex"     title="Perl regular expression STRING converter">%/<em>regex</em>/</a>
  <a target="_parent" href="formats.html#regsub"    title="Perl regular expression substitution pseudo converter">%#/<em>regex</em>/<em>subst</em>/</a>
  <a target="_parent" href="formats.html#mantexp"   title="MantissaExponent DOUBLE converter">%m</a>
  <a target="_parent" href="formats.html#timestamp" title="Timestamp DOUBLE converter">%T</a>
 </div>
--- a/doc/osinterface.html
+++ b/doc/osinterface.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Operating System API</h1>
+<h1>Operating System API</h1>
 <h2>Sorry, this documentation is still missing.</h2>
--- a/doc/processing.html
+++ b/doc/processing.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Record Processing</h1>
+<h1>Record Processing</h1>
 <a name="proc"></a>
 <h2>1. Normal Processing</h2>
--- a/doc/protocol.html
+++ b/doc/protocol.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Protocol Files</h1>
+<h1>Protocol Files</h1>
 <a name="gen"></a>
 <h2>1. General Information</h2>
 <p>
--- a/doc/recordinterface.html
+++ b/doc/recordinterface.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Record API</h1>
+<h1>Record API</h1>
 <h2>Sorry, this documentation is still missing.</h2>
--- a/doc/recordtypes.html
+++ b/doc/recordtypes.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Record Types</h1>
+<h1>Record Types</h1>
 <h2>Supported Record Types</h2>
 <p>
--- a/doc/scalcout.html
+++ b/doc/scalcout.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: scalcout Records</h1>
+<h1>scalcout Records</h1>
 <p>
 <b>Note:</b> The scalcout record is part of the <i>calc</i> module of
--- a/doc/setup.html
+++ b/doc/setup.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Setup</h1>
+<h1>Setup</h1>
 <a name="pre"></a>
 <h2>1. Prerequisites</h2>
--- a/doc/stream.css
+++ b/doc/stream.css
@ -5,8 +5,9 @@ a:hover   {color: #FF0000;}
 body {
    margin-right:1em;
    margin-left:15em;
-    margin-top:11ex;
+    margin-top:70px;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+    padding-top:1px;
    font-family: Helvetica, Arial, sans-serif;
    font-size:14px;
    background-color:#ffffff;
 }
@ -30,26 +31,26 @@ dt {
 }
 h1 {
-    font-size:225%;
+    font-size:250%;
    margin-top:0;
    font-style:italic;
-    font-family:serif;
+    font-weight:bold;
    font-family:"Times New Roman", serif;
    text-align:center;
    position:fixed;
    top:0;
    left:0;
    width:100%;
    min-height:60px;
    height: 4ex;
    line-height:190%;
    background-color:white;
-    border-top:6px solid #1b4486;
+    border-width:0;
-    border-bottom:4px solid #1b4486;
+    border-bottom:3px solid #1b4486;
    white-space:nowrap;
-    background-image:url(PSI.gif);
+    background-image:url(PSI.png);
    background-repeat:no-repeat;
-    background-position:10px 2px;
+    background-position:10px 5px;
-    text-shadow: .1em .1em .1em lightgray;           
+    text-shadow:.1em .1em .1em darkgray;
    box-shadow:0 .3em .1em -.2em darkgray;
 }
 h2 {
@ -87,11 +88,21 @@ code {
    text-align:left;
 }
 .box {
    margin-left:1ex;
    margin-right:1ex;
    margin-top:0.5ex;
    padding: 0 1ex;
    border: 1px solid black;
    text-align:left;
    background-color:#f0f0f0;
 }
 #navleft {
    position:fixed;
    left:0;
    top:0;
-    padding-top:9ex;
+    padding-top:70px;
    width:14em;
    height:100%;
    border-style:solid;
@ -115,13 +126,9 @@ a[target=ex]:hover:after {
 }
@media print {
-  a:link    {color: black; text-decoration:none;}
+  a:link    {text-decoration:none;}
  a:visited {color: black; text-decoration:none;}
  a:hover   {color: black; text-decoration:none;}
  a[target=ex] {text-decoration:underline;}
  a[target=ex]:after {content:" [" attr(href) "]";}
-  code      {color: black; }
+  body      {margin:0 4em;}
-  body      {margin-left:10px;}
+  h1        {position:relative; background-position:0 0;}
  h1        {position:absolute;}
  #navleft  {display:none;}
 }
--- a/doc/stringin.html
+++ b/doc/stringin.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: stringin Records</h1>
+<h1>stringin Records</h1>
 <h2>Normal Operation</h2>
 <p>
--- a/doc/stringout.html
+++ b/doc/stringout.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: stringout Records</h1>
+<h1>stringout Records</h1>
 <h2>Normal Operation</h2>
 <p>
--- a/doc/tipsandtricks.html
+++ b/doc/tipsandtricks.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Tips and Tricks</h1>
+<h1>Tips and Tricks</h1>
 <a name="argvar"></a>
 <h2>I have many almost identical protocols</h2>
@ -281,7 +281,7 @@ With some more records, you can clean the message record if SEVR is not INVALID.
 <code>
 record (calcout, "$(DEVICE):clean_1") {<br>
 &nbsp;&nbsp;field (INPA, "$(DEVICE):readcurrent.SEVR CP")<br>
-&nbsp;&nbsp;field (CALC, "A!=2")<br>
+&nbsp;&nbsp;field (CALC, "A#3")<br>
 &nbsp;&nbsp;field (OOPT, "When Non-zero")<br>
 &nbsp;&nbsp;field (OUT,  "$(DEVICE):clean_2.PROC")<br>
 }<br>
--- a/doc/waveform.html
+++ b/doc/waveform.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: waveform Records</h1>
+<h1>waveform Records</h1>
 <h2>Normal Operation</h2>
 <p>
--- a/src/AsynDriverInterface.cc
+++ b/src/AsynDriverInterface.cc
@ -562,13 +562,7 @@ connectToAsynPort()
        clientName(), connected ? "already" : "not yet");
    if (!connected)
    {
        printf ("%s: AsynDriverInterface::connectToAsynPort: "
            "pasynCommon->connect(%p, %p)\n",
            clientName(), pvtCommon, pasynUser);
        status = pasynCommon->connect(pvtCommon, pasynUser);
        printf ("%s: AsynDriverInterface::connectToAsynPort: "
            "pasynCommon->connect(%p, %p) = %s\n",
            clientName(), pvtCommon, pasynUser, asynStatusStr[status]);
        debug("AsynDriverInterface::connectToAsynPort(%s): "
                "status=%s\n",
            clientName(), asynStatusStr[status]);
@ -680,7 +674,7 @@ writeHandler()
            clientName());
        status = pasynOctet->read(pvtOctet, pasynUser,
            buffer, sizeof(buffer), &received, &eomReason);
-        if (received == 0) break;
+        if (status == asynError || received == 0) break;
 #ifndef NO_TEMPORARY
        if (received) debug("AsynDriverInterface::writeHandler(%s): flushing %ld bytes: \"%s\"\n",
            clientName(), (long)received, StreamBuffer(buffer, received).expand()());
@ -718,13 +712,19 @@ writeHandler()
        pasynOctet->setOutputEos(pvtOctet, pasynUser,
            NULL, 0);
    }
    pasynUser->errorMessage[0] = 0;
    status = pasynOctet->write(pvtOctet, pasynUser,
        outputBuffer, outputSize, &written);
 #ifndef NO_TEMPORARY
    debug("AsynDriverInterface::writeHandler(%s): "
-        "write(..., outputSize=%ld, written=%ld) "
+        "write(..., \"%s\", outputSize=%ld, written=%ld) "
-        "[timeout=%g sec] = %s\n",
+        "[timeout=%g sec] = %s (%s)\n",
-        clientName(), (long)outputSize,  (long)written,
+        clientName(), 
-        pasynUser->timeout, asynStatusStr[status]);
+        StreamBuffer(outputBuffer, outputSize).expand()(), 
        (long)outputSize, (long)written,
        pasynUser->timeout, asynStatusStr[status],
        pasynUser->errorMessage);
 #endif
    if (oldeoslen >= 0) // restore asyn terminator
    {
@ -769,34 +769,34 @@ writeHandler()
            writeCallback(StreamIoSuccess);
            return;
        case asynTimeout:
-            error("%s: asynTimeout (%g sec) in write. Asyn says: %s\n",
+            error("%s: asynTimeout (%g sec) in write. Asyn driver says: \"%s\"\n",
                clientName(), pasynUser->timeout, pasynUser->errorMessage);
            writeCallback(StreamIoTimeout);
            return;
        case asynOverflow:
-            error("%s: asynOverflow in write. Asyn driver says: %s\n",
+            error("%s: asynOverflow in write. Asyn driver says: \"%s\"\n",
                clientName(), pasynUser->errorMessage);
            writeCallback(StreamIoFault);
            return;
        case asynError:
-            error("%s: asynError in write. Asyn driver says: %s\n",
+            error("%s: asynError in write. Asyn driver says: \"%s\"\n",
                clientName(), pasynUser->errorMessage);
            writeCallback(StreamIoFault);
            return;
 #ifdef ASYN_VERSION // asyn >= 4.14
        case asynDisconnected:
-            error("%s: asynDisconnected in write. Asyn driver says: %s\n",
+            error("%s: asynDisconnected in write. Asyn driver says: \"%s\"\n",
                clientName(), pasynUser->errorMessage);
            writeCallback(StreamIoFault);
            return;
        case asynDisabled:
-            error("%s: asynDisconnected in write. Asyn driver says: %s\n",
+            error("%s: asynDisconnected in write. Asyn driver says: \"%s\"\n",
                clientName(), pasynUser->errorMessage);
            writeCallback(StreamIoFault);
            return;
 #endif
        default:
-            error("%s: unknown asyn error in write. Asyn driver says: %s\n",
+            error("%s: unknown asyn error in write. Asyn driver says: \"%s\"\n",
                clientName(), pasynUser->errorMessage);
            writeCallback(StreamIoFault);
            return;
@ -887,6 +887,11 @@ readHandler()
            oldeoslen = -1;
        } else do {
            // device (e.g. GPIB) might not accept full eos length
            if ((int)deveoslen == oldeoslen && strcmp(deveos, oldeos) == 0)
            {
                // nothing to do: old and new eos are the same
                break;
            }
            if (pasynOctet->setInputEos(pvtOctet, pasynUser,
                deveos, deveoslen) == asynSuccess)
            {
@ -894,8 +899,9 @@ readHandler()
                if (ioAction != AsyncRead)
                {
                    debug("AsynDriverInterface::readHandler(%s) "
-                        "input EOS set to %s\n",
+                        "input EOS changed from \"%s\" to \"%s\"\n",
                        clientName(),
                        StreamBuffer(oldeos, oldeoslen).expand()(),
                        StreamBuffer(deveos, deveoslen).expand()());
                }
 #endif
@ -951,6 +957,7 @@ readHandler()
        readMore = 0;
        received = 0;
        eomReason = 0;
        pasynUser->errorMessage[0] = 0;
        debug("AsynDriverInterface::readHandler(%s): ioAction=%s "
            "read(..., bytesToRead=%ld, ...) "
@ -959,12 +966,13 @@ readHandler()
            bytesToRead, pasynUser->timeout);
        status = pasynOctet->read(pvtOctet, pasynUser,
            buffer, bytesToRead, &received, &eomReason);
 #ifndef NO_TEMPORARY
        debug("AsynDriverInterface::readHandler(%s): "
            "read returned %s: ioAction=%s received=%ld, eomReason=%s, buffer=\"%s\"\n",
            clientName(), asynStatusStr[status], ioActionStr[ioAction],
            (long)received,eomReasonStr[eomReason&0x7],
            StreamBuffer(buffer, received).expand()());
-
+#endif
        pasynManager->isConnected(pasynUser, &connected);
        debug("AsynDriverInterface::readHandler(%s): "
            "device is now %sconnected\n",
@ -1094,29 +1102,29 @@ readHandler()
                }
                peeksize = inputBuffer.capacity();
                // deliver whatever we could save
-                error("%s: asynOverflow in read. Asyn driver says: %s\n",
+                error("%s: asynOverflow in read. Asyn driver says: \"%s\"\n",
                    clientName(), pasynUser->errorMessage);
                readCallback(StreamIoFault, buffer, received);
                break;
            case asynError:
-                error("%s: asynError in read. Asyn driver says: %s\n",
+                error("%s: asynError in read. Asyn driver says: \"%s\"\n",
                    clientName(), pasynUser->errorMessage);
                readCallback(StreamIoFault, buffer, received);
                break;
 #ifdef ASYN_VERSION // asyn >= 4.14
            case asynDisconnected:
-                error("%s: asynDisconnected in read. Asyn driver says: %s\n",
+                error("%s: asynDisconnected in read. Asyn driver says: \"%s\"\n",
                    clientName(), pasynUser->errorMessage);
                readCallback(StreamIoFault);
                return;
            case asynDisabled:
-                error("%s: asynDisconnected in read. Asyn driver says: %s\n",
+                error("%s: asynDisconnected in read. Asyn driver says: \"%s\"\n",
                    clientName(), pasynUser->errorMessage);
                readCallback(StreamIoFault);
                return;
 #endif
            default:
-                error("%s: unknown asyn error in read. Asyn driver says: %s\n",
+                error("%s: unknown asyn error in read. Asyn driver says: \"%s\"\n",
                    clientName(), pasynUser->errorMessage);
                readCallback(StreamIoFault);
                return;
@ -1138,10 +1146,16 @@ readHandler()
    }
    // restore original EOS
-    if (oldeoslen >= 0)
+    if (oldeoslen >= 0 && oldeoslen != (int)deveoslen && strcmp(deveos, oldeos) != 0)
    {
        pasynOctet->setInputEos(pvtOctet, pasynUser,
            oldeos, oldeoslen);
 #ifndef NO_TEMPORARY
        debug("AsynDriverInterface::readHandler(%s) "
            "input EOS restored to \"%s\"\n",
            clientName(),
            StreamBuffer(oldeos, oldeoslen).expand()());
 #endif
    }
 }
--- a/src/BCDConverter.cc
+++ b/src/BCDConverter.cc
@ -31,9 +31,9 @@ class BCDConverter : public StreamFormatConverter
 };
 int BCDConverter::
-parse(const StreamFormat&, StreamBuffer&, const char*&, bool)
+parse(const StreamFormat& fmt, StreamBuffer&, const char*&, bool)
 {
-    return long_format;
+    return (fmt.flags & sign_flag) ? signed_format : unsigned_format;
 }
 bool BCDConverter::
--- a/src/BinaryConverter.cc
+++ b/src/BinaryConverter.cc
@ -19,6 +19,7 @@
 ***************************************************************/
 #include <ctype.h>
 #include <limits.h>
 #include "StreamFormatConverter.h"
 #include "StreamError.h"
@ -32,51 +33,59 @@ class BinaryConverter : public StreamFormatConverter
 };
 int BinaryConverter::
-parse(const StreamFormat& format, StreamBuffer& info,
+parse(const StreamFormat& fmt, StreamBuffer& info,
    const char*& source, bool)
 {
-    if (format.conv == 'B')
+    if (fmt.conv == 'b')
    {
-        // user defined characters for %B (next 2 in source)
+        // default characters 0 and 1 for %b
        info.append("01");
        return unsigned_format;
    }
    // user defined characters for %B (next 2 in source)
    if (*source)
    {
        if (*source == esc) source++;
        info.append(*source++);
        if (*source)
        {
            if (*source == esc) source++;
            info.append(*source++);
-            if (*source)
+            return unsigned_format;
            {
                if (*source == esc) source++;
                info.append(*source++);
                return long_format;
            }
        }
        error("Missing characters after %%B format conversion\n");
        return false;
    }
-    // default characters for %b
+    error("Missing characters after %%B format conversion\n");
-    info.append("01");
+    return false;
    return long_format;
 }
 bool BinaryConverter::
-printLong(const StreamFormat& format, StreamBuffer& output, long value)
+printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
 {
-    int prec = format.prec;
+    int prec = fmt.prec;
    if (prec == -1)
    {
-        // find number of significant bits
+        // Find number of significant bits is nothing is specified.
-        prec = sizeof (value) * 8;
+        unsigned long x = (unsigned long) value;
-        while (prec && (value & (1L << (prec - 1))) == 0) prec--;
+        prec = 32;
 #if (LONG_BIT > 32)
        if (x > 0xFFFFFFFF)  { prec = 64;  x >>=32; }
 #endif 
        if (x <= 0x0000FFFF) { prec -= 16; x <<=16; }
        if (x <= 0x00FFFFFF) { prec -= 8; x <<=8; }
        if (x <= 0x0FFFFFFF) { prec -= 4; x <<=4; }
        if (x <= 0x3FFFFFFF) { prec -= 2; x <<=2; }
        if (x <= 0x7FFFFFFF) { prec -= 1; }
    }
    if (prec == 0) prec++; // print at least one bit
    int width = prec;
-    if (format.width > width) width = format.width;
+    if (fmt.width > width) width = fmt.width;
-    char zero = format.info[0];
+    char zero = fmt.info[0];
-    char one = format.info[1];
+    char one = fmt.info[1];
-    char fill = (format.flags & zero_flag) ? zero : ' ';
+    char fill = (fmt.flags & zero_flag) ? zero : ' ';
-    if (format.flags & alt_flag)
+    if (fmt.flags & alt_flag)
    {
        // little endian (least significant bit first)
-        if (!(format.flags & left_flag))
+        if (!(fmt.flags & left_flag))
        {
            // pad left
            while (width > prec)
@ -100,7 +109,7 @@ printLong(const StreamFormat& format, StreamBuffer& output, long value)
    else
    {
        // big endian (most significant bit first)
-        if (!(format.flags & left_flag))
+        if (!(fmt.flags & left_flag))
        {
            // pad left
            while (width > prec)
@ -124,18 +133,18 @@ printLong(const StreamFormat& format, StreamBuffer& output, long value)
 }
 int BinaryConverter::
-scanLong(const StreamFormat& format, const char* input, long& value)
+scanLong(const StreamFormat& fmt, const char* input, long& value)
 {
    long val = 0;
-    int width = format.width;
+    int width = fmt.width;
    if (width == 0) width = -1;
    int length = 0;
-    char zero = format.info[0];
+    char zero = fmt.info[0];
-    char one = format.info[1];
+    char one = fmt.info[1];
    if (!isspace(zero) && !isspace(one))
        while (isspace(input[length])) length++; // skip whitespaces
    if (input[length] != zero && input[length] != one) return -1;
-    if (format.flags & alt_flag)
+    if (fmt.flags & alt_flag)
    {
        // little endian (least significan bit first)
        long mask = 1;
--- a/src/ChecksumConverter.cc
+++ b/src/ChecksumConverter.cc
@ -22,9 +22,21 @@
 #include "StreamError.h"
 #if defined(__vxworks) || defined(vxWorks) || defined(_WIN32) || defined(__rtems__)
 // These systems have no strncasecmp
 #include <epicsVersion.h>
 #ifdef BASE_VERSION
 // 3.13
 #include <ctype.h>
 static int strncasecmp(const char *s1, const char *s2, size_t n)
 {
    int r=0;
    while (n && (r = toupper(*s1)-toupper(*s2)) == 0) { n--; s1++; s2++; };
    return r;
 }
 #else
 #include <epicsString.h>
 #define strncasecmp epicsStrnCaseCmp
 #endif
 #endif
 #include <ctype.h>
 typedef unsigned int (*checksumFunc)(const unsigned char* data, unsigned int len,  unsigned int init);
@ -138,38 +150,38 @@ static unsigned int crc_0x8005(const unsigned char* data, unsigned int len, unsi
 {
    // x^16 + x^15 + x^2 + x^0  (0x8005)
    const static unsigned short table[256] = {
-        0x0000,0x8005,0x800f,0x000a,0x801b,0x001e,0x0014,0x8011,
+        0x0000, 0x8005, 0x800f, 0x000a, 0x801b, 0x001e, 0x0014, 0x8011,
-        0x8033,0x0036,0x003c,0x8039,0x0028,0x802d,0x8027,0x0022,
+        0x8033, 0x0036, 0x003c, 0x8039, 0x0028, 0x802d, 0x8027, 0x0022,
-        0x8063,0x0066,0x006c,0x8069,0x0078,0x807d,0x8077,0x0072,
+        0x8063, 0x0066, 0x006c, 0x8069, 0x0078, 0x807d, 0x8077, 0x0072,
-        0x0050,0x8055,0x805f,0x005a,0x804b,0x004e,0x0044,0x8041,
+        0x0050, 0x8055, 0x805f, 0x005a, 0x804b, 0x004e, 0x0044, 0x8041,
-        0x80c3,0x00c6,0x00cc,0x80c9,0x00d8,0x80dd,0x80d7,0x00d2,
+        0x80c3, 0x00c6, 0x00cc, 0x80c9, 0x00d8, 0x80dd, 0x80d7, 0x00d2,
-        0x00f0,0x80f5,0x80ff,0x00fa,0x80eb,0x00ee,0x00e4,0x80e1,
+        0x00f0, 0x80f5, 0x80ff, 0x00fa, 0x80eb, 0x00ee, 0x00e4, 0x80e1,
-        0x00a0,0x80a5,0x80af,0x00aa,0x80bb,0x00be,0x00b4,0x80b1,
+        0x00a0, 0x80a5, 0x80af, 0x00aa, 0x80bb, 0x00be, 0x00b4, 0x80b1,
-        0x8093,0x0096,0x009c,0x8099,0x0088,0x808d,0x8087,0x0082,
+        0x8093, 0x0096, 0x009c, 0x8099, 0x0088, 0x808d, 0x8087, 0x0082,
-        0x8183,0x0186,0x018c,0x8189,0x0198,0x819d,0x8197,0x0192,
+        0x8183, 0x0186, 0x018c, 0x8189, 0x0198, 0x819d, 0x8197, 0x0192,
-        0x01b0,0x81b5,0x81bf,0x01ba,0x81ab,0x01ae,0x01a4,0x81a1,
+        0x01b0, 0x81b5, 0x81bf, 0x01ba, 0x81ab, 0x01ae, 0x01a4, 0x81a1,
-        0x01e0,0x81e5,0x81ef,0x01ea,0x81fb,0x01fe,0x01f4,0x81f1,
+        0x01e0, 0x81e5, 0x81ef, 0x01ea, 0x81fb, 0x01fe, 0x01f4, 0x81f1,
-        0x81d3,0x01d6,0x01dc,0x81d9,0x01c8,0x81cd,0x81c7,0x01c2,
+        0x81d3, 0x01d6, 0x01dc, 0x81d9, 0x01c8, 0x81cd, 0x81c7, 0x01c2,
-        0x0140,0x8145,0x814f,0x014a,0x815b,0x015e,0x0154,0x8151,
+        0x0140, 0x8145, 0x814f, 0x014a, 0x815b, 0x015e, 0x0154, 0x8151,
-        0x8173,0x0176,0x017c,0x8179,0x0168,0x816d,0x8167,0x0162,
+        0x8173, 0x0176, 0x017c, 0x8179, 0x0168, 0x816d, 0x8167, 0x0162,
-        0x8123,0x0126,0x012c,0x8129,0x0138,0x813d,0x8137,0x0132,
+        0x8123, 0x0126, 0x012c, 0x8129, 0x0138, 0x813d, 0x8137, 0x0132,
-        0x0110,0x8115,0x811f,0x011a,0x810b,0x010e,0x0104,0x8101,
+        0x0110, 0x8115, 0x811f, 0x011a, 0x810b, 0x010e, 0x0104, 0x8101,
-        0x8303,0x0306,0x030c,0x8309,0x0318,0x831d,0x8317,0x0312,
+        0x8303, 0x0306, 0x030c, 0x8309, 0x0318, 0x831d, 0x8317, 0x0312,
-        0x0330,0x8335,0x833f,0x033a,0x832b,0x032e,0x0324,0x8321,
+        0x0330, 0x8335, 0x833f, 0x033a, 0x832b, 0x032e, 0x0324, 0x8321,
-        0x0360,0x8365,0x836f,0x036a,0x837b,0x037e,0x0374,0x8371,
+        0x0360, 0x8365, 0x836f, 0x036a, 0x837b, 0x037e, 0x0374, 0x8371,
-        0x8353,0x0356,0x035c,0x8359,0x0348,0x834d,0x8347,0x0342,
+        0x8353, 0x0356, 0x035c, 0x8359, 0x0348, 0x834d, 0x8347, 0x0342,
-        0x03c0,0x83c5,0x83cf,0x03ca,0x83db,0x03de,0x03d4,0x83d1,
+        0x03c0, 0x83c5, 0x83cf, 0x03ca, 0x83db, 0x03de, 0x03d4, 0x83d1,
-        0x83f3,0x03f6,0x03fc,0x83f9,0x03e8,0x83ed,0x83e7,0x03e2,
+        0x83f3, 0x03f6, 0x03fc, 0x83f9, 0x03e8, 0x83ed, 0x83e7, 0x03e2,
-        0x83a3,0x03a6,0x03ac,0x83a9,0x03b8,0x83bd,0x83b7,0x03b2,
+        0x83a3, 0x03a6, 0x03ac, 0x83a9, 0x03b8, 0x83bd, 0x83b7, 0x03b2,
-        0x0390,0x8395,0x839f,0x039a,0x838b,0x038e,0x0384,0x8381,
+        0x0390, 0x8395, 0x839f, 0x039a, 0x838b, 0x038e, 0x0384, 0x8381,
-        0x0280,0x8285,0x828f,0x028a,0x829b,0x029e,0x0294,0x8291,
+        0x0280, 0x8285, 0x828f, 0x028a, 0x829b, 0x029e, 0x0294, 0x8291,
-        0x82b3,0x02b6,0x02bc,0x82b9,0x02a8,0x82ad,0x82a7,0x02a2,
+        0x82b3, 0x02b6, 0x02bc, 0x82b9, 0x02a8, 0x82ad, 0x82a7, 0x02a2,
-        0x82e3,0x02e6,0x02ec,0x82e9,0x02f8,0x82fd,0x82f7,0x02f2,
+        0x82e3, 0x02e6, 0x02ec, 0x82e9, 0x02f8, 0x82fd, 0x82f7, 0x02f2,
-        0x02d0,0x82d5,0x82df,0x02da,0x82cb,0x02ce,0x02c4,0x82c1,
+        0x02d0, 0x82d5, 0x82df, 0x02da, 0x82cb, 0x02ce, 0x02c4, 0x82c1,
-        0x8243,0x0246,0x024c,0x8249,0x0258,0x825d,0x8257,0x0252,
+        0x8243, 0x0246, 0x024c, 0x8249, 0x0258, 0x825d, 0x8257, 0x0252,
-        0x0270,0x8275,0x827f,0x027a,0x826b,0x026e,0x0264,0x8261,
+        0x0270, 0x8275, 0x827f, 0x027a, 0x826b, 0x026e, 0x0264, 0x8261,
-        0x0220,0x8225,0x822f,0x022a,0x823b,0x023e,0x0234,0x8231,
+        0x0220, 0x8225, 0x822f, 0x022a, 0x823b, 0x023e, 0x0234, 0x8231,
-        0x8213,0x0216,0x021c,0x8219,0x0208,0x820d,0x8207,0x0202 };
+        0x8213, 0x0216, 0x021c, 0x8219, 0x0208, 0x820d, 0x8207, 0x0202 };
    while (len--) crc = table[((crc>>8) ^ *data++) & 0xFF] ^ (crc << 8);
    return crc;
@ -180,38 +192,38 @@ static unsigned int crc_0x8005_r(const unsigned char* data, unsigned int len, un
    // x^16 + x^15 + x^2 + x^0  (0x8005)
    // reflected
    const static unsigned short table[256] = {
-        0x0000,0xC0C1,0xC181,0x0140,0xC301,0x03C0,0x0280,0xC241,
+        0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
-        0xC601,0x06C0,0x0780,0xC741,0x0500,0xC5C1,0xC481,0x0440,
+        0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
-        0xCC01,0x0CC0,0x0D80,0xCD41,0x0F00,0xCFC1,0xCE81,0x0E40,
+        0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
-        0x0A00,0xCAC1,0xCB81,0x0B40,0xC901,0x09C0,0x0880,0xC841,
+        0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841,
-        0xD801,0x18C0,0x1980,0xD941,0x1B00,0xDBC1,0xDA81,0x1A40,
+        0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40,
-        0x1E00,0xDEC1,0xDF81,0x1F40,0xDD01,0x1DC0,0x1C80,0xDC41,
+        0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41,
-        0x1400,0xD4C1,0xD581,0x1540,0xD701,0x17C0,0x1680,0xD641,
+        0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641,
-        0xD201,0x12C0,0x1380,0xD341,0x1100,0xD1C1,0xD081,0x1040,
+        0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040,
-        0xF001,0x30C0,0x3180,0xF141,0x3300,0xF3C1,0xF281,0x3240,
+        0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
-        0x3600,0xF6C1,0xF781,0x3740,0xF501,0x35C0,0x3480,0xF441,
+        0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441,
-        0x3C00,0xFCC1,0xFD81,0x3D40,0xFF01,0x3FC0,0x3E80,0xFE41,
+        0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41,
-        0xFA01,0x3AC0,0x3B80,0xFB41,0x3900,0xF9C1,0xF881,0x3840,
+        0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840,
-        0x2800,0xE8C1,0xE981,0x2940,0xEB01,0x2BC0,0x2A80,0xEA41,
+        0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41,
-        0xEE01,0x2EC0,0x2F80,0xEF41,0x2D00,0xEDC1,0xEC81,0x2C40,
+        0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40,
-        0xE401,0x24C0,0x2580,0xE541,0x2700,0xE7C1,0xE681,0x2640,
+        0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640,
-        0x2200,0xE2C1,0xE381,0x2340,0xE101,0x21C0,0x2080,0xE041,
+        0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041,
-        0xA001,0x60C0,0x6180,0xA141,0x6300,0xA3C1,0xA281,0x6240,
+        0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240,
-        0x6600,0xA6C1,0xA781,0x6740,0xA501,0x65C0,0x6480,0xA441,
+        0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
-        0x6C00,0xACC1,0xAD81,0x6D40,0xAF01,0x6FC0,0x6E80,0xAE41,
+        0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41,
-        0xAA01,0x6AC0,0x6B80,0xAB41,0x6900,0xA9C1,0xA881,0x6840,
+        0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840,
-        0x7800,0xB8C1,0xB981,0x7940,0xBB01,0x7BC0,0x7A80,0xBA41,
+        0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41,
-        0xBE01,0x7EC0,0x7F80,0xBF41,0x7D00,0xBDC1,0xBC81,0x7C40,
+        0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40,
-        0xB401,0x74C0,0x7580,0xB541,0x7700,0xB7C1,0xB681,0x7640,
+        0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640,
-        0x7200,0xB2C1,0xB381,0x7340,0xB101,0x71C0,0x7080,0xB041,
+        0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041,
-        0x5000,0x90C1,0x9181,0x5140,0x9301,0x53C0,0x5280,0x9241,
+        0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241,
-        0x9601,0x56C0,0x5780,0x9741,0x5500,0x95C1,0x9481,0x5440,
+        0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440,
-        0x9C01,0x5CC0,0x5D80,0x9D41,0x5F00,0x9FC1,0x9E81,0x5E40,
+        0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
-        0x5A00,0x9AC1,0x9B81,0x5B40,0x9901,0x59C0,0x5880,0x9841,
+        0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841,
-        0x8801,0x48C0,0x4980,0x8941,0x4B00,0x8BC1,0x8A81,0x4A40,
+        0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
-        0x4E00,0x8EC1,0x8F81,0x4F40,0x8D01,0x4DC0,0x4C80,0x8C41,
+        0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
-        0x4400,0x84C1,0x8581,0x4540,0x8701,0x47C0,0x4680,0x8641,
+        0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
-        0x8201,0x42C0,0x4380,0x8341,0x4100,0x81C1,0x8081,0x4040 };
+        0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040 };
    while (len--) crc = table[(crc ^ *data++) & 0xFF] ^ (crc >> 8);
    return crc;
@ -469,6 +481,7 @@ static checksum checksumMap[] =
    {"ccitt8",  crc_0x31,         0x00,       0x00,       1}, // 0xA1
    {"crc16",   crc_0x8005,       0x0000,     0x0000,     2}, // 0xFEE8
    {"crc16r",  crc_0x8005_r,     0x0000,     0x0000,     2}, // 0xBB3D
    {"modbus",  crc_0x8005_r,     0xFFFF,     0x0000,     2}, // 0x4B37
    {"ccitt16", crc_0x1021,       0xFFFF,     0x0000,     2}, // 0x29B1
    {"ccitt16a",crc_0x1021,       0x1D0F,     0x0000,     2}, // 0xE5CC
    {"ccitt16x",crc_0x1021,       0x0000,     0x0000,     2}, // 0x31C3
--- a/src/EnumConverter.cc
+++ b/src/EnumConverter.cc
@ -36,7 +36,7 @@ class EnumConverter : public StreamFormatConverter
 int EnumConverter::
 parse(const StreamFormat& fmt, StreamBuffer& info,
-    const char*& source, bool)
+    const char*& source, bool scanFormat)
 {
    if (fmt.flags & (left_flag|sign_flag|space_flag|zero_flag))
    {
@ -56,7 +56,30 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
        if (*source == '=' && (fmt.flags & alt_flag))
        {
            char* p;
-            index = strtol(++source, &p, 0);
+            
            if (*++source == '?')
            {
                // default choice
                if (scanFormat)
                {
                    error("Default value only allowed in output formats\n");
                    return false;
                }
                if (*++source != '}')
                {
                    error("Default value must be last\n");
                    return false;
                }
                source++;
                numEnums = -(numEnums+1);
                info.append('\0');
                memcpy(info(n), &numEnums, sizeof(numEnums));
                debug("EnumConverter::parse %ld choices with default: %s\n",
                    -numEnums, info.expand()());
                return enum_format;
            }
            index = strtol(source, &p, 0);
            if (p == source || (*p != '|' && *p != '}'))
            {
                error("Integer expected after '=' "
@ -99,6 +122,9 @@ printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
    const char* s = fmt.info;
    long numEnums = extract<long>(s);
    long index = extract<long>(s);
    bool noDefault = numEnums >= 0;
    if (numEnums < 0) numEnums=-numEnums-1;    
    while (numEnums-- && (value != index))
    {
        while(*s)
@ -109,7 +135,7 @@ printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
        s++;
        index = extract<long>(s);
    }
-    if (numEnums == -1)
+    if (numEnums == -1 && noDefault)
    {
        error("Value %li not found in enum set\n", value);
        return false;
--- a/src/RawConverter.cc
+++ b/src/RawConverter.cc
@ -31,23 +31,23 @@ class RawConverter : public StreamFormatConverter
 };
 int RawConverter::
-parse(const StreamFormat&, StreamBuffer&,
+parse(const StreamFormat& fmt, StreamBuffer&,
    const char*&, bool)
 {
-    return long_format;
+    return (fmt.flags & (sign_flag|zero_flag)) ? signed_format : unsigned_format;
 }
 bool RawConverter::
-printLong(const StreamFormat& format, StreamBuffer& output, long value)
+printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
 {
-    int prec = format.prec;      // number of bytes from value
+    int prec = fmt.prec;      // number of bytes from value
    if (prec == -1) prec = 1;    // default: 1 byte
    int width = prec;            // number of bytes in output
    if (prec > (int)sizeof(long)) prec=sizeof(long);
-    if (format.width > width) width = format.width;
+    if (fmt.width > width) width = fmt.width;
    char byte = 0;
-    if (format.flags & alt_flag) // little endian (lsb first)
+    if (fmt.flags & alt_flag) // little endian (lsb first)
    {
        while (prec--)
        {
@ -56,7 +56,7 @@ printLong(const StreamFormat& format, StreamBuffer& output, long value)
            value >>= 8;
            width--;
        }
-        if (format.flags & zero_flag)
+        if (fmt.flags & zero_flag)
        {
            // fill with zero
            byte = 0;
@ -73,7 +73,7 @@ printLong(const StreamFormat& format, StreamBuffer& output, long value)
    }
    else // big endian (msb first)
    {
-        if (format.flags & zero_flag)
+        if (fmt.flags & zero_flag)
        {
            // fill with zero
            byte = 0;
@ -97,17 +97,17 @@ printLong(const StreamFormat& format, StreamBuffer& output, long value)
 }
 int RawConverter::
-scanLong(const StreamFormat& format, const char* input, long& value)
+scanLong(const StreamFormat& fmt, const char* input, long& value)
 {
    long length = 0;
    long val = 0;
-    int width = format.width;
+    int width = fmt.width;
    if (width == 0) width = 1; // default: 1 byte
-    if (format.flags & skip_flag)
+    if (fmt.flags & skip_flag)
    {
        return width; // just skip input
    }
-    if (format.flags & alt_flag)
+    if (fmt.flags & alt_flag)
    {
        // little endian (lsb first)
        unsigned int shift = 0;
@ -118,7 +118,7 @@ scanLong(const StreamFormat& format, const char* input, long& value)
        }
        if (width == 0)
        {
-            if (format.flags & zero_flag)
+            if (fmt.flags & zero_flag)
            {
                // fill with zero
                val |= ((unsigned char) input[length++]) << shift;
@ -134,7 +134,7 @@ scanLong(const StreamFormat& format, const char* input, long& value)
    else
    {
        // big endian  (msb first)
-        if (format.flags & zero_flag)
+        if (fmt.flags & zero_flag)
        {
            // fill with zero
            val = (unsigned char) input[length++];
--- a/src/RegexpConverter.cc
+++ b/src/RegexpConverter.cc
@ -23,7 +23,7 @@
 #include "string.h"
 #include "pcre.h"
-// Perl regular expressions (PCRE)   %/regexp/
+// Perl regular expressions (PCRE) %/regexp/ and  %#/regexp/subst/
 /* Notes:
 - Memory for compiled regexp is allocated in parse but never freed.
@ -32,61 +32,93 @@
   run-time leak.
 - A maximum of 9 subexpressions is supported. Only one of them can
   be the result of the match.
 - vxWorks and maybe other OS don't have a PCRE library. Provide one?
 */
 class RegexpConverter : public StreamFormatConverter
 {
-    int parse (const StreamFormat&, StreamBuffer&, const char*&, bool);
+    int parse (const StreamFormat& fmt, StreamBuffer&, const char*&, bool);
-    int scanString(const StreamFormat&, const char*, char*, size_t);
+    int scanString(const StreamFormat& fmt, const char*, char*, size_t);
    int scanPseudo(const StreamFormat& fmt, StreamBuffer& input, long& cursor);
    bool printPseudo(const StreamFormat& fmt, StreamBuffer& output);
 };
 int RegexpConverter::
 parse(const StreamFormat& fmt, StreamBuffer& info,
    const char*& source, bool scanFormat)
 {
-    if (!scanFormat)
+    if (!scanFormat && !(fmt.flags & alt_flag))
    {
        error("Format conversion %%/regexp/ is only allowed in input formats\n");
        return false;
    }
    if (fmt.prec > 9)
    {
-        error("Subexpression index %d too big (>9)\n", fmt.prec);
+        error("Sub-expression index %d too big (>9)\n", fmt.prec);
        return false;
    }    
    if (fmt.flags & (left_flag|space_flag|zero_flag|alt_flag))
    {
        error("Use of modifiers '-', ' ', '0', '#'"
            "not allowed with %%/regexp/ conversion\n");
        return false;
    }
    StreamBuffer pattern;
    while (*source != '/')
    {
        if (!*source) {
-            error("Missing closing '/' after %%/ format conversion\n");
+            error("Missing closing '/' after %%/%s format conversion\n", pattern());
            return false;
        }
-        if (*source == esc) {
+        if (*source == esc) {          // handle escaped chars
-            source++;
+            if (*++source != '/')      // just un-escape /
-            pattern.print("\\x%02x", *source++ & 0xFF);
+            {
-            continue;
+                pattern.append('\\');
                if ((*source & 0x7f) < 0x30) // handle control chars
                {
                    pattern.print("x%02x", *source++);
                    continue;
                }
                // fall through for PCRE codes like \B
            }
        }
        pattern.append(*source++);
    }
    source++;
-    debug("regexp = \"%s\"\n", pattern());
+    debug("regexp = \"%s\"\n", pattern.expand()());
    const char* errormsg;
    int eoffset;
-    pcre* code = pcre_compile(pattern(), 0, 
+    int nsubexpr;
-        &errormsg, &eoffset, NULL);
+
    pcre* code = pcre_compile(pattern(), 0, &errormsg, &eoffset, NULL);
    if (!code)
    {
        error("%s after \"%s\"\n", errormsg, pattern.expand(0, eoffset)());
        return false;
    }
    pcre_fullinfo(code, NULL, PCRE_INFO_CAPTURECOUNT, &nsubexpr);
    if (fmt.prec > nsubexpr)
    {
        error("Sub-expression index is %d but pattern has only %d sub-expression\n", fmt.prec, nsubexpr);
        return false;
    }
    info.append(&code, sizeof(code));
    if (fmt.flags & alt_flag)
    {
        StreamBuffer subst;
        debug("check for subst in \"%s\"\n", StreamBuffer(source).expand()());
        while (*source != '/')
        {
            if (!*source) {
                error("Missing closing '/' after %%#/%s/%s format conversion\n", pattern(), subst());
                return false;
            }
            if (*source == esc)
                subst.append(*source++);
            subst.append(*source++);
        }
        source++;
        debug("subst = \"%s\"\n", subst.expand()());
        info.append(subst).append('\0');
        return pseudo_format;
    }
    return string_format;
 }
@ -94,32 +126,130 @@ int RegexpConverter::
 scanString(const StreamFormat& fmt, const char* input,
    char* value, size_t maxlen)
 {
    pcre* code;
    size_t len;
    int ovector[30];
    int rc;
-    int subexpr = 0;
+    unsigned int l;
-    
+
-    memcpy (&code, fmt.info, sizeof(code));
+    const char* info = fmt.info;
-    
+    pcre* code = extract<pcre*>(info);
-    len = fmt.width > 0 ? fmt.width : strlen(input);
+    int length = fmt.width > 0 ? fmt.width : strlen(input);
-    subexpr = fmt.prec > 0 ? fmt.prec : 0;
+    int subexpr = fmt.prec > 0 ? fmt.prec : 0;
-    rc = pcre_exec(code, NULL, input, len, 0, 0, ovector, 30);
+
-    if (rc < 1) return -1;
+    debug("input = \"%s\"\n", input);
-    if (fmt.flags & skip_flag) return ovector[1];
+    debug("length=%d\n", length);
-    len = ovector[subexpr*2+1] - ovector[subexpr*2];
+
-    if (len >= maxlen) {
+    rc = pcre_exec(code, NULL, input, length, 0, 0, ovector, 30);
    debug("pcre_exec match \"%.*s\" result = %d\n", length, input, rc);
    if ((subexpr && rc <= subexpr) || rc < 0)
    {
        // error or no match or not enough sub-expressions
        return -1;
    }
    if (fmt.flags & skip_flag) return ovector[subexpr*2+1];
    l = ovector[subexpr*2+1] - ovector[subexpr*2];
    if (l >= maxlen) {
        if (!(fmt.flags & sign_flag)) {
-            error("Regexp: Matching string \"%s\" too long (%d>%d bytes). You may want to try the + flag: \"%%+/.../\"\n",
+            error("Regexp: Matching string \"%s\" too long (%d>%ld bytes). You may want to try the + flag: \"%%+/.../\"\n",
-                StreamBuffer(input+ovector[subexpr*2], len).expand()(),
+                StreamBuffer(input + ovector[subexpr*2],l).expand()(),
-                (int)len, (int)maxlen-1);
+                l, (long)maxlen-1);
            return -1;
        }
-        len = maxlen-1;
+        l = maxlen-1;
    }
-    memcpy(value, input+ovector[subexpr*2], len);
+    memcpy(value, input + ovector[subexpr*2], l);
-    value[len]=0;
+    value[l] = '\0';
-    return ovector[1];
+    return ovector[1]; // consume input until end of match
 }
 static void regsubst(const StreamFormat& fmt, StreamBuffer& buffer, long start)
 {
    const char* subst = fmt.info;
    pcre* code = extract<pcre*>(subst);
    long length;
    int rc, l, c, r, rl, n;
    int ovector[30];
    StreamBuffer s;
    length = buffer.length() - start;
    if (fmt.width && fmt.width < length)
        length = fmt.width;
    if (fmt.flags & left_flag)
        start = buffer.length() - length;
    debug("regsubst buffer=\"%s\", start=%ld, length=%ld, subst = \"%s\"\n",
        buffer.expand()(), start, length, StreamBuffer(subst).expand()());
    for (c = 0, n = 1; c < length; n++)
    {
        rc = pcre_exec(code, NULL, buffer(start+c), length-c, 0, 0, ovector, 30);
        debug("pcre_exec match \"%s\" result = %d\n", buffer.expand(start+c, length-c)(), rc);
        if (rc < 0) // no match
            return;
        if (!(fmt.flags & sign_flag) && n < fmt.prec) // without + flag
        {
            // do not yet replace this match
            c += ovector[1];
            continue;
        }
        // replace & by match in subst
        l = ovector[1] - ovector[0];
        debug("before [%d]= \"%s\"\n", ovector[0], buffer.expand(start+c,ovector[0])());
        debug("match  [%d]= \"%s\"\n", l, buffer.expand(start+c+ovector[0],l)());
        for (r = 1; r < rc; r++)
            debug("sub%d = \"%s\"\n", r, buffer.expand(start+c+ovector[r*2], ovector[r*2+1]-ovector[r*2])());
        debug("after     = \"%s\"\n", buffer.expand(start+c+ovector[1])());
        s = subst;
        debug("subs      = \"%s\"\n", s.expand()());
        for (r = 0; r < s.length(); r++)
        {
            debug("check \"%s\"\n", s.expand(r)());
            if (s[r] == esc)
            {
                unsigned char ch = s[r+1];
                if (c != 0 && ch < rc) // escaped 1 - 9 : replace with subexpr
                {
                    ch *= 2;
                    rl = ovector[ch+1] - ovector[ch];
                    debug("replace \\%d: \"%s\"\n", ch/2, buffer.expand(start+c+ovector[ch], rl)());
                    s.replace(r, 2, buffer(start+c+ovector[ch]), rl);
                    r += rl - 1;
                }
                else
                    s.remove(r, 1); // just remove escape
            }
            else if (s[r] == '&') // unescaped & : replace with match
            {
                debug("replace &: \"%s\"\n", buffer.expand(start+c+ovector[0], l)());
                s.replace(r, 1, buffer(start+c+ovector[0]), l);
                r += l - 1;
            }
            else continue;
            debug("subs = \"%s\"\n", s.expand()());
        }
        buffer.replace(start+c+ovector[0], l, s);
        length += s.length() - l;
        c += ovector[0] + s.length();
        if (n == fmt.prec) // max match reached
            return;
    }
 }
 int RegexpConverter::
 scanPseudo(const StreamFormat& fmt, StreamBuffer& input, long& cursor)
 {
    /* re-write input buffer */
    regsubst(fmt, input, cursor);
    return 0;
 }
 bool RegexpConverter::
 printPseudo(const StreamFormat& fmt, StreamBuffer& output)
 {
    /* re-write output buffer */
    regsubst(fmt, output, 0);
    return true;
 }
 RegisterConverter (RegexpConverter, "/");
--- a/src/StreamBuffer.cc
+++ b/src/StreamBuffer.cc
@ -296,7 +296,7 @@ StreamBuffer StreamBuffer::expand(ssize_t start, ssize_t length) const
    for (i = start; i < end; i++)
    {
        c = buffer[i];
-        if ((c & 0x7f) < 0x20 || (c & 0x7f) == 0x7f)
+        if (c < 0x20 || c >= 0x7f)
        {
            result.print("<%02x>", c & 0xff);
        }
--- a/src/StreamCore.cc
+++ b/src/StreamCore.cc
@ -460,7 +460,7 @@ finishProtocol(ProtocolResult status)
        status = Fault;
    }
 ////    flags &= ~(AcceptInput|AcceptEvent);
-    if (runningHandler)
+    if (runningHandler || flags & InitRun)
    {
        // get original error status
        if (status == Success) status = runningHandler;
@ -749,7 +749,7 @@ printSeparator()
 bool StreamCore::
 printValue(const StreamFormat& fmt, long value)
 {
-    if (fmt.type != long_format && fmt.type != enum_format)
+    if (fmt.type != unsigned_format && fmt.type != signed_format && fmt.type != enum_format)
    {
        error("%s: printValue(long) called with %%%c format\n",
            name(), fmt.conv);
@ -763,8 +763,8 @@ printValue(const StreamFormat& fmt, long value)
            name(), value);
        return false;
    }
-    debug("StreamCore::printValue(%s, long): \"%s\"\n",
+    debug("StreamCore::printValue %s %%%c long %ld (%lx): \"%s\"\n",
-        name(), outputLine.expand()());
+        name(), fmt.conv, value, value, outputLine.expand()());
    return true;
 }
@ -785,8 +785,8 @@ printValue(const StreamFormat& fmt, double value)
            name(), value);
        return false;
    }
-    debug("StreamCore::printValue(%s, double): \"%s\"\n",
+    debug("StreamCore::printValue %s %%%c double %#g: \"%s\"\n",
-        name(), outputLine.expand()());
+        name(), fmt.conv, value, outputLine.expand()());
    return true;
 }
@ -808,8 +808,8 @@ printValue(const StreamFormat& fmt, char* value)
            name(), buffer.expand()());
        return false;
    }
-    debug("StreamCore::printValue(%s, char*): \"%s\"\n",
+    debug("StreamCore::printValue %s %%%c char* \"%s\"): \"%s\"\n",
-        name(), outputLine.expand()());
+        name(), fmt.conv, value, outputLine.expand()());
    return true;
 }
@ -832,7 +832,7 @@ lockCallback(StreamIoStatus status)
        case StreamIoSuccess:
            break;
        case StreamIoTimeout:
-            error("%s: Cannot lock device within %ld ms, device seems to be busy\n",
+            debug("%s: Cannot lock device within %ld ms, device seems to be busy\n",
                name(), lockTimeout);
            flags &= ~BusOwner;
            finishProtocol(LockTimeout);
@ -991,7 +991,7 @@ readCallback(StreamIoStatus status,
                evalIn();
                return 0;
            }
-            error("%s: No reply from device within %ld ms\n",
+            debug("StreamCore::readCallback(%s): No reply from device within %ld ms\n",
                name(), replyTimeout);
            inputBuffer.clear();
            finishProtocol(ReplyTimeout);
@ -1216,7 +1216,8 @@ normal_format:
                    double ddummy;
                    switch (fmt.type)
                    {
-                        case long_format:
+                        case unsigned_format:
                        case signed_format:
                        case enum_format:
                            consumed = StreamFormatConverter::find(fmt.conv)->
                                scanLong(fmt, inputLine(consumedInput), ldummy);
@ -1457,7 +1458,7 @@ matchSeparator()
 long StreamCore::
 scanValue(const StreamFormat& fmt, long& value)
 {
-    if (fmt.type != long_format && fmt.type != enum_format)
+    if (fmt.type != unsigned_format && fmt.type != signed_format && fmt.type != enum_format)
    {
        error("%s: scanValue(long&) called with %%%c format\n",
            name(), fmt.conv);
@ -1478,6 +1479,7 @@ scanValue(const StreamFormat& fmt, long& value)
        }
        else return -1;
    }
    if (fmt.flags & fix_width_flag && consumed != fmt.width) return -1;
    if (consumed > inputLine.length()-consumedInput) return -1;
    debug("StreamCore::scanValue(%s) scanned %li\n",
        name(), value);
@ -1509,6 +1511,7 @@ scanValue(const StreamFormat& fmt, double& value)
        }
        else return -1;
    }
    if (fmt.flags & fix_width_flag && (consumed != (fmt.width + fmt.prec + 1))) return -1;
    if (consumed > inputLine.length()-consumedInput) return -1;
    debug("StreamCore::scanValue(%s) scanned %#g\n",
        name(), value);
@ -1541,6 +1544,7 @@ scanValue(const StreamFormat& fmt, char* value, long maxlen)
        }
        else return -1;
    }
    if (fmt.flags & fix_width_flag && consumed != fmt.width) return -1;
    if (consumed > inputLine.length()-consumedInput) return -1;
 #ifndef NO_TEMPORARY
    debug("StreamCore::scanValue(%s) scanned \"%s\"\n",
--- a/src/StreamEpics.cc
+++ b/src/StreamEpics.cc
@ -115,7 +115,6 @@ class Stream : protected StreamCore
    epicsMutex mutex;
    epicsEvent initDone;
 #endif
    StreamBuffer fieldBuffer;
    int status;
    int convert;
    long currentValueLength;
@ -181,6 +180,7 @@ public:
 #ifndef EPICS_3_13
 extern "C" {
 epicsExportAddress(int, streamDebug);
 epicsExportAddress(int, streamError);
 }
 #endif
@ -196,8 +196,12 @@ extern "C" long streamReload(char* recordname)
    dbCommon*   record;
    long status;
    int oldStreamError = streamError;
    streamError = 1;
    if(!pdbbase) {
        error("No database has been loaded\n");
        streamError = oldStreamError;
        return ERROR;
    }
    debug("streamReload(%s)\n", recordname);
@ -234,6 +238,7 @@ extern "C" long streamReload(char* recordname)
    }
    dbFinishEntry(&dbentry);
    StreamProtocolParser::free();
    streamError = oldStreamError;
    return OK;
 }
@ -270,7 +275,7 @@ epicsExportRegistrar(streamRegistrar);
 struct stream_drvsup {
    long number;
    long (*report)(int);
-    DRVSUPFUN init;
+    long (*init)();
 } stream = {
    2,
    Stream::report,
@ -408,6 +413,7 @@ long streamInit(int after)
 {
    if (after)
    {
        streamError = 0; // Switch off errors after init in order not to spam messages when a device is down.
        StreamProtocolParser::free();
    }
    return OK;
@ -416,6 +422,7 @@ long streamInit(int after)
 long streamInitRecord(dbCommon* record, const struct link *ioLink,
    streamIoFunction readData, streamIoFunction writeData)
 {
    long status;
    char filename[80];
    char protocol[80];
    char busname[80];
@ -441,13 +448,14 @@ long streamInitRecord(dbCommon* record, const struct link *ioLink,
    // scan the i/o link
    debug("streamInitRecord(%s): parse link \"%s\"\n",
        record->name, ioLink->value.instio.string);
-    pstream->parseLink(ioLink, filename, protocol,
+    status = pstream->parseLink(ioLink, filename, protocol,
        busname, &addr, busparam);
    // (re)initialize bus and protocol
    debug("streamInitRecord(%s): calling initRecord\n",
        record->name);
-    long status = pstream->initRecord(filename, protocol,
+    if (status == 0)
-        busname, addr, busparam);
+        status = pstream->initRecord(filename, protocol,
            busname, addr, busparam);
    if (status != OK && status != DO_NOT_CONVERT)
    {
        error("%s: Record initialization failed\n", record->name);
@ -602,7 +610,7 @@ parseLink(const struct link *ioLink, char* filename,
    if (items <= 0)
    {
        error("%s: Empty I/O link. "
-            "Forgot the leading '@' or confused INP with OUT ?\n",
+            "Forgot the leading '@' or confused INP with OUT or link is too long ?\n",
            name());
        return S_dev_badInitRet;
    }
@ -733,37 +741,31 @@ process()
    debug("Stream::process(%s) start\n", name());
    status = NO_ALARM;
    convert = OK;
    record->pact = true;
    if (!startProtocol(StreamCore::StartNormal))
    {
        debug("Stream::process(%s): could not start, status=%d\n",
            name(), status);
        (void) recGblSetSevr(record, status, INVALID_ALARM);
        record->pact = false;
        return false;
    }
    debug("Stream::process(%s): protocol started\n", name());
    record->pact = true;
    return true;
 }
 bool Stream::
 print(format_t *format, va_list ap)
 {
    long lval;
    double dval;
    char* sval;
    switch (format->type)
    {
-        case DBF_ENUM:
+        case DBF_ULONG:
        case DBF_LONG:
-            lval = va_arg(ap, long);
+        case DBF_ENUM:
-            return printValue(*format->priv, lval);
+            return printValue(*format->priv, va_arg(ap, long));
        case DBF_DOUBLE:
-            dval = va_arg(ap, double);
+            return printValue(*format->priv, va_arg(ap, double));
            return printValue(*format->priv, dval);
        case DBF_STRING:
-            sval = va_arg(ap, char*);
+            return printValue(*format->priv, va_arg(ap, char*));
            return printValue(*format->priv, sval);
    }
    error("INTERNAL ERROR (%s): Illegal format type\n", name());
    return false;
@ -773,27 +775,22 @@ bool Stream::
 scan(format_t *format, void* value, size_t maxStringSize)
 {
    // called by streamScanfN
    long* lptr;
    double* dptr;
    char* sptr;
    // first remove old value from inputLine (if we are scanning arrays)
    consumedInput += currentValueLength;
    currentValueLength = 0;
    switch (format->type)
    {
        case DBF_ULONG:
        case DBF_LONG:
        case DBF_ENUM:
-            lptr = (long*)value;
+            currentValueLength = scanValue(*format->priv, *(long*)value);
            currentValueLength = scanValue(*format->priv, *lptr);
            break;
        case DBF_DOUBLE:
-            dptr = (double*)value;
+            currentValueLength = scanValue(*format->priv, *(double*)value);
            currentValueLength = scanValue(*format->priv, *dptr);
            break;
        case DBF_STRING:
-            sptr = (char*)value;
+            currentValueLength  = scanValue(*format->priv, (char*)value,
            currentValueLength  = scanValue(*format->priv, sptr,
                maxStringSize);
            break;
        default:
@ -963,13 +960,13 @@ getFieldAddress(const char* fieldname, StreamBuffer& address)
    else
    {
        // FIELD in this record or VAL in other record
-        char fullname[PVNAME_SZ + 1];
+        StreamBuffer fullname;
-        sprintf(fullname, "%s.%s", name(), fieldname);
+        fullname.print("%s.%s", name(), fieldname);
-        if (dbNameToAddr(fullname, &dbaddr) != OK)
+        if (dbNameToAddr(fullname(), &dbaddr) != OK)
        {
            // VAL in other record
-            sprintf(fullname, "%s.VAL", fieldname);
+            fullname.clear().print("%s.VAL", fieldname);
-            if (dbNameToAddr(fullname, &dbaddr) != OK) return false;
+            if (dbNameToAddr(fullname(), &dbaddr) != OK) return false;
        }
    }
    address.append(&dbaddr, sizeof(dbaddr));
@ -977,9 +974,9 @@ getFieldAddress(const char* fieldname, StreamBuffer& address)
 }
 static const unsigned char dbfMapping[] =
-    {0, DBF_LONG, DBF_ENUM, DBF_DOUBLE, DBF_STRING};
+    {0, DBF_ULONG, DBF_LONG, DBF_ENUM, DBF_DOUBLE, DBF_STRING};
 static const short typeSize[] =
-    {0, sizeof(epicsInt32), sizeof(epicsUInt16),
+    {0, sizeof(epicsUInt32), sizeof(epicsInt32), sizeof(epicsUInt16),
        sizeof(epicsFloat64), MAX_STRING_SIZE};
 bool Stream::
@ -991,16 +988,17 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
 // --  TO DO: If SCAN is "I/O Intr" and record has not been processed,  --
 // --  do it now to get the latest value (only for output records?)     --
    format_s fmt;
    fmt.type = dbfMapping[format.type];
    fmt.priv = &format;
    if (fieldaddress)
    {
        // Format like "%([record.]field)..." has requested to get value
        // from field of this or other record.
        StreamBuffer fieldBuffer;
        DBADDR* pdbaddr = (DBADDR*)fieldaddress;
        long i;
        long nelem = pdbaddr->no_elements;
        size_t size = nelem * typeSize[format.type];
        char* buffer = fieldBuffer.clear().reserve(size);
        /* Handle time stamps special. %T converter takes double. */
        if (strcmp(((dbFldDes*)pdbaddr->pfldDes)->name, "TIME") == 0)
        {
            double time;
@ -1016,6 +1014,8 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
                /* if getting time from own record, update timestamp first */
                recGblGetTimeStamp(record);
            }
            /* convert EPICS epoch (1990) to unix epoch (1970) */
            /* we are losing about 3 digits precision here */
            time = pdbaddr->precord->time.secPastEpoch +
                631152000u + pdbaddr->precord->time.nsec * 1e-9;
            debug("Stream::formatValue(%s): read %f from TIME field\n",
@ -1023,7 +1023,28 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
            return printValue(format, time);
        }
-        if (dbGet(pdbaddr, dbfMapping[format.type], buffer,
+        /* convert type to LONG, ENUM, DOUBLE, or STRING */
        long nelem = pdbaddr->no_elements;
        size_t size = nelem * typeSize[format.type];
        /* print (U)CHAR arrays as string */
        if (format.type == string_format &&
            (pdbaddr->field_type == DBF_CHAR || pdbaddr->field_type == DBF_UCHAR))
        {
            debug("Stream::formatValue(%s): format %s.%s array[%ld] size %d of %s as string\n",
                name(),
                pdbaddr->precord->name,
                ((dbFldDes*)pdbaddr->pfldDes)->name,
                nelem,
                pdbaddr->field_size,
                pamapdbfType[pdbaddr->field_type].strvalue);
            fmt.type = DBF_CHAR;
            size = nelem;
        }
        char* buffer = fieldBuffer.clear().reserve(size);
        if (dbGet(pdbaddr, fmt.type, buffer,
            NULL, &nelem, NULL) != 0)
        {
            error("%s: dbGet(%s.%s, %s) failed\n",
@ -1033,6 +1054,18 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
                pamapdbfType[dbfMapping[format.type]].strvalue);
            return false;
        }
        debug("Stream::formatValue(%s): got %ld elements\n",
                name(),nelem);
        /* terminate CHAR array as string */
        if (fmt.type == DBF_CHAR)
        {
            if (nelem >= pdbaddr->no_elements) nelem = pdbaddr->no_elements-1;
            buffer[nelem] = 0;
            nelem = 1; /* array is only 1 string */
        }
        long i;
        for (i = 0; i < nelem; i++)
        {
            switch (format.type)
@ -1042,7 +1075,12 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
                        (long)((epicsUInt16*)buffer)[i]))
                        return false;
                    break;
-                case long_format:
+                case unsigned_format:
                    if (!printValue(format,
                        (long)((epicsUInt32*)buffer)[i]))
                        return false;
                    break;
                case signed_format:
                    if (!printValue(format,
                        (long)((epicsInt32*)buffer)[i]))
                        return false;
@ -1060,6 +1098,7 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
                    error("%s: %%(FIELD) syntax not allowed "
                        "with pseudo formats\n",
                        name());
                    return false;
                default:
                    error("INTERNAL ERROR %s: Illegal format.type=%d\n",
                        name(), format.type);
@ -1068,9 +1107,6 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
        }
        return true;
    }
    format_s fmt;
    fmt.type = dbfMapping[format.type];
    fmt.priv = &format;
    debug("Stream::formatValue(%s) format=%%%c type=%s\n",
        name(), format.conv, pamapdbfType[fmt.type].strvalue);
    if (!writeData)
@ -1096,11 +1132,15 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
    char* buffer;
    int status;
    const char* putfunc;
    format_s fmt;
    fmt.type = dbfMapping[format.type];
    fmt.priv = &format;
    if (fieldaddress)
    {
        // Format like "%([record.]field)..." has requested to put value
        // to field of this or other record.
        StreamBuffer fieldBuffer;
        DBADDR* pdbaddr = (DBADDR*)fieldaddress;
        long nord;
        long nelem = pdbaddr->no_elements;
@ -1112,12 +1152,24 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
                name(), fieldBuffer.expand()());
            switch (format.type)
            {
-                case long_format:
+                case unsigned_format:
                {
                    consumed = scanValue(format, lval);
                    if (consumed >= 0) ((epicsUInt32*)buffer)[nord] = lval;
                    debug("Stream::matchValue(%s): %s.%s[%li] = %lu\n",
                            name(), pdbaddr->precord->name,
                            ((dbFldDes*)pdbaddr->pfldDes)->name,
                            nord, lval);
                    break;
                }
                case signed_format:
                {
                    consumed = scanValue(format, lval);
                    if (consumed >= 0) ((epicsInt32*)buffer)[nord] = lval;
-                    debug("Stream::matchValue(%s): %s[%li] = %li\n",
+                    debug("Stream::matchValue(%s): %s.%s[%li] = %li\n",
-                            name(), pdbaddr->precord->name, nord, lval);
+                            name(), pdbaddr->precord->name,
                            ((dbFldDes*)pdbaddr->pfldDes)->name,
                            nord, lval);
                    break;
                }
                case enum_format:
@ -1125,8 +1177,10 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
                    consumed = scanValue(format, lval);
                    if (consumed >= 0)
                        ((epicsUInt16*)buffer)[nord] = (epicsUInt16)lval;
-                    debug("Stream::matchValue(%s): %s[%li] = %li\n",
+                    debug("Stream::matchValue(%s): %s.%s[%li] = %li\n",
-                            name(), pdbaddr->precord->name, nord, lval);
+                            name(), pdbaddr->precord->name,
                            ((dbFldDes*)pdbaddr->pfldDes)->name,
                            nord, lval);
                    break;
                }
                case double_format:
@ -1139,18 +1193,34 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
                    if (consumed >= 0)
                        memcpy(((epicsFloat64*)buffer)+nord,
                            &f64, sizeof(f64));
-                    debug("Stream::matchValue(%s): %s[%li] = %#g %#g\n",
+                    debug("Stream::matchValue(%s): %s.%s[%li] = %#g %#g\n",
-                            name(), pdbaddr->precord->name, nord, dval,
+                            name(), pdbaddr->precord->name,
                            ((dbFldDes*)pdbaddr->pfldDes)->name,
                            nord, dval,
                            ((epicsFloat64*)buffer)[nord]);
                    break;
                }
                case string_format:
                {
-                    consumed = scanValue(format,
+                    if (pdbaddr->field_type == DBF_CHAR)
-                        buffer+MAX_STRING_SIZE*nord, MAX_STRING_SIZE);
+                    {
-                    debug("Stream::matchValue(%s): %s[%li] = \"%.*s\"\n",
+                        // string to char array
-                            name(), pdbaddr->precord->name, nord,
+                        consumed = scanValue(format, buffer, nelem);
-                            MAX_STRING_SIZE, buffer+MAX_STRING_SIZE*nord);
+                        debug("Stream::matchValue(%s): %s.%s = \"%.*s\"\n",
                                name(), pdbaddr->precord->name,
                                ((dbFldDes*)pdbaddr->pfldDes)->name,
                                (int)consumed, buffer);
                        nord = nelem;
                    }
                    else
                    {
                        consumed = scanValue(format,
                            buffer+MAX_STRING_SIZE*nord, MAX_STRING_SIZE);
                        debug("Stream::matchValue(%s): %s.%s[%li] = \"%.*s\"\n",
                                name(), pdbaddr->precord->name,
                                ((dbFldDes*)pdbaddr->pfldDes)->name,
                                nord, MAX_STRING_SIZE, buffer+MAX_STRING_SIZE*nord);
                    }
                    break;
                }
                default:
@ -1187,15 +1257,17 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
                    name());
                return false;
            }
            /* convert from Unix epoch (1 Jan 1970) to EPICS epoch (1 Jan 1990) */
            dval = dval-631152000u;
            pdbaddr->precord->time.secPastEpoch = (long)dval;
            // rouding: we don't have 9 digits precision
            // in a double of today's number of seconds
            pdbaddr->precord->time.nsec = (long)((dval-(long)dval)*1e6)*1000;
-            debug("Stream::matchValue(%s): writing %i.%i to TIME field\n",
+            debug("Stream::matchValue(%s): writing %i.%i to %s.TIME field\n",
                name(),
                pdbaddr->precord->time.secPastEpoch,
-                pdbaddr->precord->time.nsec);
+                pdbaddr->precord->time.nsec,
                pdbaddr->precord->name);
            pdbaddr->precord->tse = epicsTimeEventDeviceTime;
            return true;
 #else
@ -1204,18 +1276,19 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
            return false;
 #endif
        }
-        
+        if (format.type == string_format &&
            (pdbaddr->field_type == DBF_CHAR || pdbaddr->field_type == DBF_UCHAR))
        {
            /* write strings to [U]CHAR arrays */
            nord = consumed;
            fmt.type = DBF_CHAR;
        }
        if (pdbaddr->precord == record || INIT_RUN)
        {
            // write into own record, thus don't process it
            // in @init we must not process other record
            debug("Stream::matchValue(%s): dbPut(%s.%s,%s)\n",
                name(),
                pdbaddr->precord->name,
                ((dbFldDes*)pdbaddr->pfldDes)->name,
                fieldBuffer.expand()());
            putfunc = "dbPut";
-            status = dbPut(pdbaddr, dbfMapping[format.type], buffer, nord);
+            status = dbPut(pdbaddr, fmt.type, buffer, nord);
            if (INIT_RUN && pdbaddr->precord != record)
            {
                // clean error status of other record in @init
@ -1227,41 +1300,44 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
        else
        {
            // write into other record, thus process it
            debug("Stream::matchValue(%s): dbPutField(%s.%s,%s)\n",
                name(),
                pdbaddr->precord->name,
                ((dbFldDes*)pdbaddr->pfldDes)->name,
                fieldBuffer.expand()());
            putfunc = "dbPutField";
-            status = dbPutField(pdbaddr, dbfMapping[format.type],
+            status = dbPutField(pdbaddr, fmt.type,
                buffer, nord);
        }
        debug("Stream::matchValue(%s): %s(%s.%s, %s, %s) status=0x%x\n",
            name(), putfunc,
            pdbaddr->precord->name,
            ((dbFldDes*)pdbaddr->pfldDes)->name,
            pamapdbfType[fmt.type].strvalue,
            fieldBuffer.expand()(),
            status);
        if (status != 0)
        {
            flags &= ~ScanTried;
-            switch (format.type)
+            switch (fmt.type)
            {
-                case long_format:
+                case DBF_ULONG:
-                case enum_format:
+                case DBF_LONG:
                case DBF_ENUM:
                    error("%s: %s(%s.%s, %s, %li) failed\n",
-                        putfunc, name(), pdbaddr->precord->name,
+                        name(), putfunc, pdbaddr->precord->name,
                        ((dbFldDes*)pdbaddr->pfldDes)->name,
-                        pamapdbfType[dbfMapping[format.type]].strvalue,
+                        pamapdbfType[fmt.type].strvalue,
                        lval);
                    return false;
-                case double_format:
+                case DBF_DOUBLE:
                    error("%s: %s(%s.%s, %s, %#g) failed\n",
-                        putfunc, name(), pdbaddr->precord->name,
+                        name(), putfunc, pdbaddr->precord->name,
                        ((dbFldDes*)pdbaddr->pfldDes)->name,
-                        pamapdbfType[dbfMapping[format.type]].strvalue,
+                        pamapdbfType[fmt.type].strvalue,
                        dval);
                    return false;
-                case string_format:
+                case DBF_STRING:
-                    error("%s: %s(%s.%s, %s, \"%s\") failed\n",
+                    error("%s: %s(%s.%s, %s, \"%.*s\") failed\n",
-                        putfunc, name(), pdbaddr->precord->name,
+                        name(), putfunc, pdbaddr->precord->name,
                        ((dbFldDes*)pdbaddr->pfldDes)->name,
-                        pamapdbfType[dbfMapping[format.type]].strvalue,
+                        pamapdbfType[fmt.type].strvalue,
-                        buffer);
+                        (int)consumed, buffer);
                    return false;
                default:
                    return false;
@ -1270,9 +1346,6 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
        return true;
    }
    // no fieldaddress (the "normal" case)
    format_s fmt;
    fmt.type = dbfMapping[format.type];
    fmt.priv = &format;
    if (!readData)
    {
        error("%s: No readData() function provided\n", name());
--- a/src/StreamError.cc
+++ b/src/StreamError.cc
@ -23,6 +23,7 @@
 #include <stdio.h>
 int streamDebug = 0;
 int streamError = 1;
 extern "C" {
 #ifdef _WIN32
 __declspec(dllexport)
@ -74,6 +75,7 @@ void StreamError(int line, const char* file, const char* fmt, ...)
 void StreamVError(int line, const char* file, const char* fmt, va_list args)
 {
    char timestamp[40];
    if (!streamError) return; // Error logging disabled
    StreamPrintTimestampFunction(timestamp, 40);
 #ifdef va_copy
    if (StreamDebugFile)
--- a/src/StreamError.h
+++ b/src/StreamError.h
@ -28,6 +28,7 @@
 #endif
 extern int streamDebug;
 extern int streamError;
 extern void (*StreamPrintTimestampFunction)(char* buffer, int size);
 void StreamError(int line, const char* file, const char* fmt, ...)
--- a/src/StreamFormat.h
+++ b/src/StreamFormat.h
@ -30,15 +30,17 @@ typedef enum {
    zero_flag    = 0x10,
    skip_flag    = 0x20,
    default_flag = 0x40,
-    compare_flag = 0x80
+    compare_flag = 0x80,
    fix_width_flag = 0x100,
 } StreamFormatFlag;
 typedef enum {
-    long_format   = 1,
+    unsigned_format = 1,
-    enum_format   = 2,
+    signed_format,
-    double_format = 3,
+    enum_format,
-    string_format = 4,
+    double_format,
-    pseudo_format = 5
+    string_format,
    pseudo_format
 } StreamFormatType;
 extern const char* StreamFormatTypeStr[];
@ -47,7 +49,7 @@ typedef struct StreamFormat
 {
    char conv;
    StreamFormatType type;
-    unsigned char flags;
+    unsigned short flags;
    short prec;
    unsigned short width;
    unsigned short infolen;
--- a/src/StreamFormatConverter.cc
+++ b/src/StreamFormatConverter.cc
@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <limits.h>
 #include "StreamFormatConverter.h"
 #include "StreamError.h"
@ -37,7 +38,7 @@ parseFormat(const char*& source, FormatType formatType, StreamFormat& streamForm
 {
 /*
    source := [flags] [width] ['.' prec] conv [extra]
-    flags := '-' | '+' | ' ' | '#' | '0' | '*' | '?' | '='
+    flags := '-' | '+' | ' ' | '#' | '0' | '*' | '?' | '=' | '!'
    width := integer
    prec :=  integer
    conv := character
@ -84,6 +85,15 @@ parseFormat(const char*& source, FormatType formatType, StreamFormat& streamForm
                }
                streamFormat.flags |= default_flag;
                break;
            case '!':
                if (formatType != ScanFormat)
                {
                    error("Use of fixed width modifier '!' "
                          "only allowed in input formats\n");
                    return false;
                }
                streamFormat.flags |= fix_width_flag;
                break;
            case '=':
                if (formatType != ScanFormat)
                {
@ -310,12 +320,16 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
        info.append('l');
        info.append(fmt.conv);
    }
-    return long_format;
+    if (fmt.conv == 'd' || fmt.conv == 'i') return signed_format;
    return unsigned_format;
 }
 bool StdLongConverter::
 printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
 {
    // limits %x/%X formats to number of half bytes in width.
    if (fmt.width && (fmt.conv == 'x' || fmt.conv == 'X') && fmt.width < 2*sizeof(long))
        value &= ~(-1L << (fmt.width*4));
    output.print(fmt.info, value);
    return true;
 }
@ -327,6 +341,7 @@ scanLong(const StreamFormat& fmt, const char* input, long& value)
    int length;
    bool neg;
    int base;
    long v;
    length = prepareval(fmt, input, neg);
    if (length < 0) return -1;
@ -336,14 +351,11 @@ scanLong(const StreamFormat& fmt, const char* input, long& value)
            base = 10;
            break;
        case 'o':
            base = 8;
            goto signcheck;
        case 'x':
        case 'X':
-            base = 16;
+            // allow negative hex and oct numbers with - flag
 signcheck:
        // allow negative hex and oct numbers with - flag
            if (neg && !(fmt.flags & left_flag)) return -1;
            base = (fmt.conv == 'o') ? 8 : 16;
            break;
        case 'u':
            if (neg) return -1;
@ -352,10 +364,10 @@ signcheck:
        default:
            base = 0;
    }
-    value = strtoul(input, &end, base);
+    v = strtoul(input, &end, base);
    if (neg) value = -value;
    if (end == input) return -1;
    length += end-input;
    value = neg ? -v : v;
    return length;
 }
@ -543,7 +555,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
        info.append("%n");
        return string_format;
    }
-    return long_format;
+    return unsigned_format;
 }
 bool StdCharsConverter::
--- a/src/StreamProtocol.cc
+++ b/src/StreamProtocol.cc
@ -26,7 +26,8 @@
 #include "StreamError.h"
 const char* StreamFormatTypeStr[] = {
-    "none", "long", "enum", "double", "string", "pseudo"
+    // must match the order in StreamFormat.h
    "none", "unsigned", "signed", "enum", "double", "string", "pseudo"
 };
 class StreamProtocolParser::Protocol::Variable
@ -511,20 +512,31 @@ Each time newline is read, line is incremented.
                    buffer(token));
                return false;
            }
            if (c == '$' && buffer[-1] == '\\')
            {
                // quoted variable reference
                // terminate string here and do variable in next pass
                buffer[-1] = quote;
                ungetc(c, file);
                break;
            }
            buffer.append(c);
-            if (c == quote && buffer[-2] != '\\')
+            if (c == quote)
            {
                quote = false;
                break;
            }
            if (c == '\\')
            {
                c = getc(file);
                if (c == '$')
                {
                    // quoted variable reference
                    // terminate string here and do variable in next pass
                    buffer[-1] = quote;
                    ungetc(c, file);
                    break;
                }
                if (c == EOF || c == '\n')
                {
                    error(line, filename(), "Backslash at end of line: %s\n",
                        buffer(token));
                    return false;
                }
                buffer.append(c);
            }
            c = getc(file);
        }
        buffer.append('\0').append(&l, sizeof(l)); // append line number
@ -1347,7 +1359,8 @@ compileString(StreamBuffer& buffer, const char*& source,
                        source);
                    return false;
                }
-                if (formatType != NoFormat)
+                if (formatType != NoFormat &&
                    i > 2 /* do not escape skip */)
                {
                    buffer.append(esc);
                }
@ -1438,7 +1451,7 @@ compileFormat(StreamBuffer& buffer, const char*& formatstr,
        // parsing failed
        return false;
    }
-    if (type < long_format && type > pseudo_format)
+    if (type < 1 && type > pseudo_format)
    {
        error(line, filename(),
            "Illegal format type %d returned from '%%%c' converter\n",
--- a/src/TimestampConverter.cc
+++ b/src/TimestampConverter.cc
@ -26,6 +26,24 @@
 #include <stdlib.h>
 #include <errno.h>
 /* timezone in UNIX contains the seconds between UTC and local time,
 but not in Free-BSD! Here timezone() is a function delivering
 the time zone abbreviation (e.g. CET). Alternatively, the timezone
 value can also be gained from tm_gmtoff of the tm-structure. 
                                                    HJK, 4.4.14 */
 /* The same seems to be true for other BSDs. DZ. */
 #if defined(__FreeBSD__) || \
    defined(__NetBSD__) || \
    defined(__OpenBSD__) || \
    defined(__bsdi__ ) || \
    defined(__DragonFly__)
 static int timezone_bsd=0;
 #define timezone timezone_bsd
 #define tzset() { struct tm tm; time_t timet; tzset(); time(&timet);	\
                  localtime_r(&timet, &tm); timezone=tm.tm_gmtoff; }
 #endif
 #ifdef _WIN32
 #define tzset() _tzset()
 #define timezone _timezone
@ -46,6 +64,13 @@ int timezone = 0;
 } while (0)
 #endif
 #if defined(__MINGW32__)
 /* MinGW has no re-entrant localtime. How about other environments? */
 /* Just let's hope for the best */
 #undef localtime_r
 #define localtime_r(timet,tm) (*(tm)=*localtime(timet))
 #endif
 class TimestampConverter : public StreamFormatConverter
 {
    int parse(const StreamFormat&, StreamBuffer&, const char*&, bool);
@ -366,7 +391,7 @@ startover:
                        debug ("TimestampConverter::scantime: %s hour = %d\n", pm?"PM":"AM", tm->tm_hour);
                        break;
                    case 'M': /* minute */
-                        i = nummatch(input, 1, 59);
+                        i = nummatch(input, 0, 59);
                        if (i < 0)
                        {
                            error ("error parsing minute: '%.20s'\n", input);
@ -376,7 +401,7 @@ startover:
                        debug ("TimestampConverter::scantime: min = %d\n", tm->tm_min);
                        break;
                    case 'S': /* second */
-                        i = nummatch(input, 1, 60);
+                        i = nummatch(input, 0, 60);
                        if (i < 0)
                        {
                            error ("error parsing week second: '%.20s'\n", input);
--- a/src/devStream.h
+++ b/src/devStream.h
@ -22,8 +22,8 @@
 #define devStream_h
 #define STREAM_MAJOR 2
-#define STREAM_MINOR 6
+#define STREAM_MINOR 7
-#define STREAM_PATCHLEVEL 6
+#define STREAM_PATCHLEVEL 14
 #if defined(__vxworks) || defined(vxWorks)
 #include <vxWorks.h>
@ -58,7 +58,6 @@ extern "C" {
 #include <dbCommon.h>
 #include <dbScan.h>
 #include <devSup.h>
 /* #include <dbFldTypes.h> */
 #include <dbAccess.h>
 #ifdef devStream_epicsExportSharedSymbols
--- a/src/devaaiStream.c
+++ b/src/devaaiStream.c
@ -20,9 +20,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include "devStream.h"
 #include <aaiRecord.h>
 #include <errlog.h>
 #include <aaiRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
@ -57,6 +57,7 @@ static long readData (dbCommon *record, format_t *format)
                }
                break;
            }
            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
@ -191,6 +192,7 @@ static long writeData (dbCommon *record, format_t *format)
                    return ERROR;
                break;
            }
            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
--- a/src/devaaoStream.c
+++ b/src/devaaoStream.c
@ -20,9 +20,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include "devStream.h"
 #include <aaoRecord.h>
 #include <errlog.h>
 #include <aaoRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
@ -57,6 +57,7 @@ static long readData (dbCommon *record, format_t *format)
                }
                break;
            }
            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
@ -191,6 +192,7 @@ static long writeData (dbCommon *record, format_t *format)
                    return ERROR;
                break;
            }
            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
--- a/src/devaiStream.c
+++ b/src/devaiStream.c
@ -18,10 +18,18 @@
 *                                                              *
 ***************************************************************/
-#include "devStream.h"
+#include <math.h>
 #include <menuConvert.h>
 #include <aiRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 #ifdef vxWorks
 #include <private/mathP.h>
 #define isinf(x) isInf(x)
 #define isnan(x) isNan(x)
 #endif
 static long readData (dbCommon *record, format_t *format)
 {
    aiRecord *ai = (aiRecord *) record;
@ -32,20 +40,31 @@ static long readData (dbCommon *record, format_t *format)
        {
            double val;
            if (streamScanf (record, format, &val)) return ERROR;
-            if (ai->aslo != 0.0) val *= ai->aslo;
+            if (ai->aslo != 0.0 && ai->aslo != 1.0) val *= ai->aslo;
            val += ai->aoff;
-            if (!INIT_RUN && ai->smoo != 0.0)
+            if (!(ai->smoo == 0.0 || ai->init || ai->udf || isinf(ai->val) || isnan(ai->val)))
            {
                val = ai->val * ai->smoo + val * (1.0 - ai->smoo);
            }
            ai->val = val;
            return DO_NOT_CONVERT;
        }
        case DBF_ULONG:
        case DBF_LONG:
        {
            long rval;
            if (streamScanf (record, format, &rval)) return ERROR;
            ai->rval = rval;
            if (ai->linr == menuConvertNO_CONVERSION)
            {
                /* allow integers with more than 32 bits */
                double val;
                if (format->type == DBF_ULONG)
                    val = (unsigned long)rval;
                else    
                    val = rval;
                if (ai->aslo != 0.0 && ai->aslo != 1.0) val *= ai->aslo;
                ai->val = val + ai->aoff;
                return DO_NOT_CONVERT;
            }
            return OK;
        }
    }
@ -55,19 +74,32 @@ static long readData (dbCommon *record, format_t *format)
 static long writeData (dbCommon *record, format_t *format)
 {
    aiRecord *ai = (aiRecord *) record;
    double val;
    switch (format->type)
    {
        case DBF_DOUBLE:
        {
-            val = ai->val - ai->aoff;
+            double val = ai->val - ai->aoff;
-            if (ai->aslo != 0) val /= ai->aslo;
+            if (ai->aslo != 0.0 && ai->aslo != 1.0) val /= ai->aslo;
            return streamPrintf (record, format, val);
        }
        case DBF_ULONG:
        {
            if (ai->linr == menuConvertNO_CONVERSION)
            {
                /* allow more bits than 32 */
                return streamPrintf (record, format, (unsigned long)ai->val);
            }
            return streamPrintf (record, format, (unsigned long)ai->rval);
        }
        case DBF_LONG:
        {
-            return streamPrintf (record, format, (long) ai->rval);
+            if (ai->linr == menuConvertNO_CONVERSION)
            {
                /* allow more bits than 32 */
                return streamPrintf (record, format, (long)ai->val);
            }
            return streamPrintf (record, format, (long)ai->rval);
        }
    }
    return ERROR;
--- a/src/devaoStream.c
+++ b/src/devaoStream.c
@ -18,8 +18,9 @@
 *                                                              *
 ***************************************************************/
-#include "devStream.h"
+#include <menuConvert.h>
 #include <aoRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
@ -32,16 +33,29 @@ static long readData (dbCommon *record, format_t *format)
        {
            double val;
            if (streamScanf (record, format, &val)) return ERROR;
-            if (ao->aslo != 0) val *= ao->aslo;
+            if (ao->aslo != 0.0 && ao->aslo != 1.0) val *= ao->aslo;
            ao->val = val + ao->aoff;
            return DO_NOT_CONVERT;
        }
        case DBF_ULONG:
        case DBF_LONG:
        {
            long rval;
            if (streamScanf (record, format, &rval)) return ERROR;
            ao->rbv = rval;
-            if (INIT_RUN) ao->rval = rval;
+            ao->rval = rval;
            if (ao->linr == menuConvertNO_CONVERSION)
            {
                /* allow integers with more than 32 bits */
                double val;
                if (format->type == DBF_ULONG)
                    val = (unsigned long)rval;
                else    
                    val = rval;
                if (ao->aslo != 0.0 && ao->aslo != 1.0) val *= ao->aslo;
                ao->val = val + ao->aoff;
                return DO_NOT_CONVERT;
            }
            return OK;
        }
    }
@ -52,20 +66,32 @@ static long writeData (dbCommon *record, format_t *format)
 {
    aoRecord *ao = (aoRecord *) record;
    double val = (INIT_RUN ? ao->val : ao->oval) - ao->aoff;
    if (ao->aslo != 0.0 && ao->aslo != 1.0) val /= ao->aslo;
    switch (format->type)
    {
        case DBF_DOUBLE:
        {
            double val;
            if (INIT_RUN) val = ao->val;
            else val = ao->oval;
            val -= ao->aoff;
            if (ao->aslo != 0) val /= ao->aslo;
            return streamPrintf (record, format, val);
        }
        case DBF_ULONG:
        {
            if (ao->linr == menuConvertNO_CONVERSION)
            {
                /* allow integers with more than 32 bits */
                return streamPrintf (record, format, (unsigned long)val);
            }
            return streamPrintf (record, format, (unsigned long)ao->rval);
        }
        case DBF_LONG:
        {
-            return streamPrintf (record, format, (long) ao->rval);
+            if (ao->linr == menuConvertNO_CONVERSION)
            {
                /* allow integers with more than 32 bits */
                return streamPrintf (record, format, (long)val);
            }
            return streamPrintf (record, format, (long)ao->rval);
        }
    }
    return ERROR;
--- a/src/devbiStream.c
+++ b/src/devbiStream.c
@ -18,9 +18,9 @@
 *                                                              *
 ***************************************************************/
 #include "devStream.h"
 #include <biRecord.h>
 #include <string.h>
 #include <biRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
@ -30,6 +30,7 @@ static long readData (dbCommon *record, format_t *format)
    switch (format->type)
    {
        case DBF_ULONG:
        case DBF_LONG:
        {
            if (streamScanf (record, format, &val)) return ERROR;
@ -69,13 +70,14 @@ static long writeData (dbCommon *record, format_t *format)
    switch (format->type)
    {
        case DBF_ULONG:
        case DBF_LONG:
        {
            return streamPrintf (record, format, bi->rval);
        }
        case DBF_ENUM:
        {
-            return streamPrintf (record, format, (long) bi->val);
+            return streamPrintf (record, format, (long)bi->val);
        }
        case DBF_STRING:
        {
--- a/src/devboStream.c
+++ b/src/devboStream.c
@ -18,9 +18,9 @@
 *                                                              *
 ***************************************************************/
 #include "devStream.h"
 #include <boRecord.h>
 #include <string.h>
 #include <boRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
@ -30,6 +30,7 @@ static long readData (dbCommon *record, format_t *format)
    switch (format->type)
    {
        case DBF_ULONG:
        case DBF_LONG:
        {
            if (streamScanf (record, format, &val)) return ERROR;
@ -70,13 +71,14 @@ static long writeData (dbCommon *record, format_t *format)
    switch (format->type)
    {
        case DBF_ULONG:
        case DBF_LONG:
        {
            return streamPrintf (record, format, bo->rval);
        }
        case DBF_ENUM:
        {
-            return streamPrintf (record, format, (long) bo->val);
+            return streamPrintf (record, format, (long)bo->val);
        }
        case DBF_STRING:
        {
--- a/src/devcalcoutStream.c
+++ b/src/devcalcoutStream.c
@ -17,9 +17,9 @@
 *                                                              *
 ***************************************************************/
 #include "devStream.h"
 #include <postfix.h>
 #include <calcoutRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
@ -32,13 +32,17 @@ static long readData (dbCommon *record, format_t *format)
        {
            return streamScanf (record, format, &co->val);
        }
        case DBF_ULONG:
        case DBF_LONG:
        case DBF_ENUM:
        {
            long lval;
            if (streamScanf (record, format, &lval)) return ERROR;
-            co->val = lval;
+            if (format->type == DBF_LONG)
                co->val = lval;
            else
                co->val = (unsigned long)lval;
            return OK;
        }
    }
@ -55,8 +59,12 @@ static long writeData (dbCommon *record, format_t *format)
        {
            return streamPrintf (record, format, co->oval);
        }
-        case DBF_LONG:
+        case DBF_ULONG:
        case DBF_ENUM:
        {
            return streamPrintf (record, format, (unsigned long)co->oval);
        }
        case DBF_LONG:
        {
            return streamPrintf (record, format, (long)co->oval);
        }
--- a/src/devlonginStream.c
+++ b/src/devlonginStream.c
@ -18,20 +18,25 @@
 *                                                              *
 ***************************************************************/
 #include "devStream.h"
 #include <longinRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
 {
    longinRecord *li = (longinRecord *) record;
-    if (format->type == DBF_LONG || format->type == DBF_ENUM)
+    switch (format->type)
    {
-        long val;
+        case DBF_ULONG:
-        if (streamScanf (record, format, &val)) return ERROR;
+        case DBF_LONG:
-        li->val = val;
+        case DBF_ENUM:
-        return OK;
+        {       
            long val;
            if (streamScanf (record, format, &val)) return ERROR;
            li->val = val;
            return OK;
        }
    }
    return ERROR;
 }
@ -40,9 +45,13 @@ static long writeData (dbCommon *record, format_t *format)
 {
    longinRecord *li = (longinRecord *) record;
-    if (format->type == DBF_LONG || format->type == DBF_ENUM)
+    switch (format->type)
    {
-        return streamPrintf (record, format, (long) li->val);
+        case DBF_ULONG:
        case DBF_ENUM:
            return streamPrintf (record, format, (unsigned long)li->val);
        case DBF_LONG:
            return streamPrintf (record, format, (long)li->val);
    }
    return ERROR;
 }
--- a/src/devlongoutStream.c
+++ b/src/devlongoutStream.c
@ -19,20 +19,25 @@
 *                                                              *
 ***************************************************************/
 #include "devStream.h"
 #include <longoutRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
 {
    longoutRecord *lo = (longoutRecord *) record;
-    if (format->type == DBF_LONG || format->type == DBF_ENUM)
+    switch (format->type)
    {
-        long val;
+        case DBF_ULONG:
-        if (streamScanf (record, format, &val)) return ERROR;
+        case DBF_LONG:
-        lo->val = val;
+        case DBF_ENUM:
-        return OK;
+        {       
            long val;
            if (streamScanf (record, format, &val)) return ERROR;
            lo->val = val;
            return OK;
        }
    }
    return ERROR;
 }
@ -41,9 +46,13 @@ static long writeData (dbCommon *record, format_t *format)
 {
    longoutRecord *lo = (longoutRecord *) record;
-    if (format->type == DBF_LONG || format->type == DBF_ENUM)
+    switch (format->type)
    {
-        return streamPrintf (record, format, (long) lo->val);
+        case DBF_ULONG:
        case DBF_ENUM:
            return streamPrintf (record, format, (unsigned long)lo->val);
        case DBF_LONG:
            return streamPrintf (record, format, (long)lo->val);
    }
    return ERROR;
 }
--- a/src/devmbbiDirectStream.c
+++ b/src/devmbbiDirectStream.c
@ -19,16 +19,16 @@
 *                                                              *
 ***************************************************************/
 #include "devStream.h"
 #include <mbbiDirectRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
 {
    mbbiDirectRecord *mbbiD = (mbbiDirectRecord *) record;
-    long val;
+    unsigned long val;
-    if (format->type == DBF_LONG)
+    if (format->type == DBF_ULONG || format->type == DBF_LONG)
    {
        if (streamScanf (record, format, &val)) return ERROR;
        if (mbbiD->mask)
@ -40,7 +40,7 @@ static long readData (dbCommon *record, format_t *format)
        else
        {
            /* No MASK, (NOBT = 0): use VAL field */
-            mbbiD->val = (short)val;
+            mbbiD->val = (unsigned short)val;
            return DO_NOT_CONVERT;
        }
    }
@ -50,9 +50,9 @@ static long readData (dbCommon *record, format_t *format)
 static long writeData (dbCommon *record, format_t *format)
 {
    mbbiDirectRecord *mbbiD = (mbbiDirectRecord *) record;
-    long val;
+    unsigned long val;
-    if (format->type == DBF_LONG)
+    if (format->type == DBF_ULONG || format->type == DBF_LONG)
    {
        if (mbbiD->mask) val = mbbiD->rval & mbbiD->mask;
        else val = mbbiD->val;
--- a/src/devmbbiStream.c
+++ b/src/devmbbiStream.c
@ -19,19 +19,20 @@
 *                                                              *
 ***************************************************************/
 #include "devStream.h"
 #include <mbbiRecord.h>
 #include <string.h>
 #include <mbbiRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
 {
    mbbiRecord *mbbi = (mbbiRecord *) record;
-    long val;
+    unsigned long val;
    int i;
    switch (format->type)
    {
        case DBF_ULONG:
        case DBF_LONG:
        {
            if (streamScanf (record, format, &val)) return ERROR;
--- a/src/devmbboDirectStream.c
+++ b/src/devmbboDirectStream.c
@ -19,16 +19,17 @@
 *                                                              *
 ***************************************************************/
 #include "devStream.h"
 #include <mbboDirectRecord.h>
 #include "alarm.h"
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
 {
    mbboDirectRecord *mbboD = (mbboDirectRecord *) record;
-    long val;
+    unsigned long val;
-    if (format->type == DBF_LONG)
+    if (format->type == DBF_ULONG || format->type == DBF_LONG)
    {
        if (streamScanf (record, format, &val)) return ERROR;
        if (mbboD->mask)
@ -53,7 +54,7 @@ static long writeData (dbCommon *record, format_t *format)
    mbboDirectRecord *mbboD = (mbboDirectRecord *) record;
    long val;
-    if (format->type == DBF_LONG)
+    if (format->type == DBF_ULONG || format->type == DBF_LONG)
    {
        if (mbboD->mask) val = mbboD->rval & mbboD->mask;
        else val = mbboD->val;
@ -67,9 +68,27 @@ static long initRecord (dbCommon *record)
    mbboDirectRecord *mbboD = (mbboDirectRecord *) record;
    mbboD->mask <<= mbboD->shft;
    /* Workaround for bug in mbboDirect record:
       Put to VAL overwrites value to 0 if SEVR is INVALID_ALARM
       Thus first write may send a wrong value.
    */
    mbboD->sevr = 0;    
    return streamInitRecord (record, &mbboD->out, readData, writeData);
 }
 /* Unfortunately the bug also corrupts the next write to VAL after an I/O error.
   Thus make sure the record is never left in INVALID_ALARM status.
 */
 static long write(dbCommon *record)
 {
    long status = streamWrite(record);
    if (record->nsev == INVALID_ALARM) record->nsev = MAJOR_ALARM;
    return status;
 }
 struct {
    long number;
    DEVSUPFUN report;
@ -83,7 +102,7 @@ struct {
    streamInit,
    initRecord,
    streamGetIointInfo,
-    streamWrite
+    write
 };
 epicsExportAddress(dset,devmbboDirectStream);
--- a/src/devmbboStream.c
+++ b/src/devmbboStream.c
@ -19,19 +19,20 @@
 *                                                              *
 ***************************************************************/
 #include "devStream.h"
 #include <mbboRecord.h>
 #include <string.h>
 #include <mbboRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
 {
    mbboRecord *mbbo = (mbboRecord *) record;
-    long val;
+    unsigned long val;
    int i;
    switch (format->type)
    {
        case DBF_ULONG:
        case DBF_LONG:
        {
            if (streamScanf (record, format, &val)) return ERROR;
@ -76,11 +77,12 @@ static long readData (dbCommon *record, format_t *format)
 static long writeData (dbCommon *record, format_t *format)
 {
    mbboRecord *mbbo = (mbboRecord *) record;
-    long val;
+    unsigned long val;
    int i;
    switch (format->type)
    {
        case DBF_ULONG:
        case DBF_LONG:
        {
            /* print VAL or RVAL ? */
--- a/src/devstringinStream.c
+++ b/src/devstringinStream.c
@ -18,8 +18,8 @@
 *                                                              *
 ***************************************************************/
 #include "devStream.h"
 #include <stringinRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
--- a/src/devstringoutStream.c
+++ b/src/devstringoutStream.c
@ -18,8 +18,8 @@
 *                                                              *
 ***************************************************************/
 #include "devStream.h"
 #include <stringoutRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
--- a/src/devwaveformStream.c
+++ b/src/devwaveformStream.c
@ -18,10 +18,10 @@
 *                                                              *
 ***************************************************************/
 #include "devStream.h"
 #include <waveformRecord.h>
 #include <string.h>
 #include <errlog.h>
 #include <waveformRecord.h>
 #include "devStream.h"
 #include <epicsExport.h>
 static long readData (dbCommon *record, format_t *format)
@ -57,6 +57,7 @@ static long readData (dbCommon *record, format_t *format)
                }
                break;
            }
            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
@ -191,6 +192,7 @@ static long writeData (dbCommon *record, format_t *format)
                    return ERROR;
                break;
            }
            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
--- a/src/makedbd.pl
+++ b/src/makedbd.pl
@ -2,6 +2,7 @@ if (@ARGV[0] == "-3.13") {
    shift;
 } else {
    print "variable(streamDebug, int)\n";
    print "variable(streamError, int)\n";
    print "registrar(streamRegistrar)\n";
 }
 print "driver(stream)\n";
--- a/streamApp/tests/streamtestlib.tcl
+++ b/streamApp/tests/streamtestlib.tcl
@ -55,7 +55,7 @@ proc startioc {} {
        if [info exists asynversion] {
            puts $fd "require asyn,$asynversion"
        }
-        puts $fd "require stream2,$streamversion"
+        puts $fd "require stream,$streamversion"
    } else {
        puts $fd "#!../O.$env(EPICS_HOST_ARCH)/streamApp"
        puts $fd "dbLoadDatabase ../O.Common/streamApp.dbd"
@ -77,7 +77,9 @@ proc startioc {} {
    }
    fconfigure $ioc -blocking yes -buffering none
    debugmsg "waiting to connect"
    set timer [after 1000 {puts stderr "\033\[31;7mCannot start IOC.\033\[0m"; exit 1}]
    vwait sock
    after cancel $timer
 }
 set lastcommand ""
--- a/streamApp/tests/testDouble
+++ b/streamApp/tests/testDouble
@ -41,12 +41,10 @@ set protocol {
 set startup {
 }
 set debug 0
 startioc
 set inf [format %f inf]
-set nan [format %f nan]
+if [catch {set nan [format %f nan]}] {set nan nan}
 ioccmd {dbpf DZ:test1.PROC 1}
 send "3.14159265359\n"
--- a/streamApp/tests/testEnum
+++ b/streamApp/tests/testEnum
@ -50,7 +50,7 @@ set protocol {
    in  {in  "%{zero|one|two}bla"; out "%d";}
    out1 {out "%#{zero|one|two}bla";}
    in1  {in  "%#{zero|one|two}bla"; out "%d";}
-    out2 {out "%#{zero=-1|one|two=5}bla";}
+    out2 {out "%#{zero=-1|one|two=5|default=?}bla";}
    in2  {in  "%#{zero=-1|one|two=5}bla"; out "%d";}
    in3  {in  "%{\x00|\r|}bla"; out "%d";}
 }
@ -81,6 +81,8 @@ ioccmd {dbpf DZ:testout2 0}
 assure "onebla\n"
 ioccmd {dbpf DZ:testout2 5}
 assure "twobla\n"
 ioccmd {dbpf DZ:testout2 17}
 assure "defaultbla\n"
 ioccmd {dbpf DZ:testin.PROC 1}
 send "zerobla\n"
--- a/streamApp/tests/testFormats
+++ b/streamApp/tests/testFormats
@ -68,15 +68,15 @@ ioccmd {dbpf DZ:lo 12345}
 assure "12345 12345 012345 3039 003039 11000000111001 11000000111001 111001 !!......!!!..! !!......!!!..!\n"
 ioccmd {dbpf DZ:lo -1}
 if {$tcl_platform(machine) == "x86_64"} {
-assure "-1 -1 -00001 ffffffffffffffff FFFFFFFFFFFFFFFF 1111111111111111111111111111111111111111111111111111111111111111 1111111111111111111111111111111111111111111111111111111111111111 111111 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
+assure "-1 -1 -00001 ffffffffffffffff FFFFFF 11111111111111111111111111111111 11111111111111111111111111111111 111111 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
 } else {
-assure "-1 -1 -00001 ffffffff FFFFFFFF 11111111111111111111111111111111 11111111111111111111111111111111 111111 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
+assure "-1 -1 -00001 ffffffff FFFFFF 11111111111111111111111111111111 11111111111111111111111111111111 111111 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
 }
 ioccmd {dbpf DZ:lo -1234}
 if {$tcl_platform(machine) == "x86_64"} {
-assure "-1234 -1234 -01234 fffffffffffffb2e FFFFFFFFFFFFFB2E 1111111111111111111111111111111111111111111111111111101100101110 1111111111111111111111111111111111111111111111111111101100101110 101110 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!.!!..!.!!!. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!.!!..!.!!!.\n"
+assure "-1234 -1234 -01234 fffffffffffffb2e FFFB2E 11111111111111111111101100101110 11111111111111111111101100101110 101110 !!!!!!!!!!!!!!!!!!!!!.!!..!.!!!. !!!!!!!!!!!!!!!!!!!!!.!!..!.!!!.\n"
 } else {
-assure "-1234 -1234 -01234 fffffb2e FFFFFB2E 11111111111111111111101100101110 11111111111111111111101100101110 101110 !!!!!!!!!!!!!!!!!!!!!.!!..!.!!!. !!!!!!!!!!!!!!!!!!!!!.!!..!.!!!.\n"
+assure "-1234 -1234 -01234 fffffb2e FFFB2E 11111111111111111111101100101110 11111111111111111111101100101110 101110 !!!!!!!!!!!!!!!!!!!!!.!!..!.!!!. !!!!!!!!!!!!!!!!!!!!!.!!..!.!!!.\n"
 }
 ioccmd {dbpf DZ:lo 255}
 assure "255 255 000255 ff 0000FF 11111111 11111111 111111 !!!!!!!! !!!!!!!!\n"
--- a/streamApp/tests/testInteger
+++ b/streamApp/tests/testInteger
@ -10,16 +10,19 @@ set records {
    record (ai, "DZ:test1")
    {
        field (DTYP, "stream")
        field (LINR, "LINEAR")
        field (INP,  "@test.proto test1 device")
    }
    record (ai, "DZ:test2")
    {
        field (DTYP, "stream")
        field (LINR, "LINEAR")
        field (INP,  "@test.proto test2 device")
    }
    record (ai, "DZ:test3")
    {
        field (DTYP, "stream")
        field (LINR, "LINEAR")
        field (INP,  "@test.proto test3 device")
    }
    record (ai, "DZ:test4")
@ -30,26 +33,31 @@ set records {
    record (ai, "DZ:test5")
    {
        field (DTYP, "stream")
        field (LINR, "LINEAR")
        field (INP,  "@test.proto test5 device")
    }
    record (ai, "DZ:test6")
    {
        field (DTYP, "stream")
        field (LINR, "LINEAR")
        field (INP,  "@test.proto test6 device")
    }
    record (ai, "DZ:test7")
    {
        field (DTYP, "stream")
        field (LINR, "LINEAR")
        field (INP,  "@test.proto test7 device")
    }
    record (ai, "DZ:test8")
    {
        field (DTYP, "stream")
        field (LINR, "LINEAR")
        field (INP,  "@test.proto test8 device")
    }
    record (ai, "DZ:test9")
    {
        field (DTYP, "stream")
        field (LINR, "LINEAR")
        field (INP,  "@test.proto test9 device")
    }
    record (ai, "DZ:test10")
--- a/streamApp/tests/testStreamBuffer
+++ b/streamApp/tests/testStreamBuffer
@ -53,13 +53,22 @@ int main () {
 }
 EOF
-g++ -I ../../src ../../src/O.$EPICS_HOST_ARCH/StreamBuffer.o test.cc -o test.exe
+if [ "$1" = "-sls" ]
 test.exe
 if [ $? != 0 ]
 then
-    echo -e "\033[31;7mTest failed.\033[0m"
+    O=../../O.*_$EPICS_HOST_ARCH/StreamBuffer.o
-    exit 1
+else
    O=../../src/O.$EPICS_HOST_ARCH/StreamBuffer.o
 fi
 for o in $O
 do
    g++ -I ../../src $o test.cc -o test.exe
    test.exe
    if [ $? != 0 ]
    then
        echo -e "\033[31;7mTest failed.\033[0m"
        exit 1
    fi
 done
 rm test.*
 echo -e "\033[32mTest passed.\033[0m"
Author	SHA1	Message	Date
Dirk Zimoch	d5dc15e321	version updated	2018-07-12 16:16:34 +02:00
Dirk Zimoch	cfa777d718	added missing output convertion from ULONG in waveform record	2018-07-12 16:11:38 +02:00
Dirk Zimoch	54bc78f7c7	fix bug that leads to infinite callback loop when first command (typically 'out') fails	2018-07-12 16:07:48 +02:00
Dirk Zimoch	77d110de70	fix for 'skip' and '?' in 'in' command	2018-07-11 18:00:08 +02:00
Dirk Zimoch	19467bd5d5	allow literal \0 - \9 in regsub if there is no matching sub-expression	2018-07-10 11:08:36 +02:00
Dirk Zimoch	d69c74bc8f	update version	2018-07-06 17:03:40 +02:00
Dirk Zimoch	e09506c2bb	always enable error messages when loading protocol files	2018-07-06 17:02:34 +02:00
Dirk Zimoch	343eef324b	bugfix: in quoted strings do not mis-interpret double backslash before quote or $ as escape char	2018-07-06 16:48:15 +02:00
Dirk Zimoch	a798cf2f21	buxfix: in regsub continue scanning only after last substitution	2018-07-06 14:37:18 +02:00
Dirk Zimoch	23f3e806e2	removed unfiltered debug message	2018-06-08 10:54:21 +02:00
Dirk Zimoch	56b6c9a627	fix for 3.16+	2018-06-06 10:51:18 +02:00
Dirk Zimoch	2830f07324	update version number	2017-11-03 13:46:08 +01:00
Dirk Zimoch	abd8daafc3	escape all non-ascii chars to avoid problems with UTF terminals	2017-11-03 13:41:38 +01:00
Dirk Zimoch	489e783872	Don't change EOS if not necessary. And some improved diagnostics	2017-11-03 13:40:47 +01:00
Dirk Zimoch	10d1fa8b02	do not run exceprion handlers from @init	2017-11-02 09:18:24 +01:00
Dirk Zimoch	c8bffebfc6	fix version number	2017-11-02 09:17:47 +01:00
Dirk Zimoch	0a90eb3d9c	fix ai/ao conversion when using LINR=NO CONVERSION together with ASLO or AOFF	2017-01-18 16:03:02 +01:00
Dirk Zimoch	0936ac7840	version update	2016-08-05 12:04:07 +02:00
Dirk Zimoch	704ece6231	Disable error messages by default in order to prevent filling the log. Set variable streamDebug to 1 to enable error messages.	2016-08-05 12:03:50 +02:00
Dirk Zimoch	5c6e98127e	typo fixed	2016-08-05 12:01:52 +02:00
Dirk Zimoch	8805437c68	remove unneeded file	2016-08-02 11:18:15 +02:00
Dirk Zimoch	3acf791409	make docu for %r converer more specific about %.2r versus %2r	2016-07-01 10:56:46 +02:00
Dirk Zimoch	0ba674a341	workaround for mbboDirect bug	2016-07-01 10:38:38 +02:00
Dirk Zimoch	40c33abac7	workaround for mbboDirect bug	2016-07-01 10:18:34 +02:00
Dirk Zimoch	bc67317b0b	change the meaning of pre for regsub slightly	2016-06-15 14:52:45 +02:00
Dirk Zimoch	06e212c66e	version macros updated	2016-06-14 12:06:30 +02:00
Dirk Zimoch	7b314ccffd	bugfix in regsub	2016-06-14 12:00:02 +02:00
Dirk Zimoch	1d84986ee8	do not fill log files with lock errors	2016-06-14 11:43:30 +02:00
Dirk Zimoch	2ca8a129f7	regsub converter added	2016-06-14 11:36:36 +02:00
Dirk Zimoch	126da8c499	"No reply from device" error message removed because it only fills the log files	2016-06-08 15:15:12 +02:00
Dirk Zimoch	ea110d5047	improved error message	2016-04-28 11:58:23 +02:00
Dirk Zimoch	b37fad41c6	use local variable for fieldBuffer because on some arch (Moxa ARM5) 64 bit (double) values are corrupted otherwise	2016-04-07 11:05:51 +02:00
Dirk Zimoch	74775996db	find clean way to create dbd file	2015-12-07 17:22:40 +01:00
Dirk Zimoch	74426aab66	provide local strncasecmp for 3.13	2015-12-07 17:21:44 +01:00
Dirk Zimoch	690bbb13d4	version macros updated	2015-12-07 15:15:06 +01:00
Dirk Zimoch	871fbed2b0	checksums updated	2015-10-19 13:58:06 +02:00
Dirk Zimoch	85c68d2ae6	uppercase	2015-10-19 13:58:06 +02:00
Dirk Zimoch	8870611d4d	modbus checksum added	2015-10-19 13:58:06 +02:00
Dirk Zimoch	67af7fc1bf	links updated	2015-10-19 13:58:06 +02:00
Dirk Zimoch	93bea174e4	highlinting of new featured removed	2015-10-19 13:58:06 +02:00
Dirk Zimoch	84fc6aabc8	fixed witdth flag ! added	2015-10-19 13:58:06 +02:00
Dirk Zimoch	38c4f5bcb6	renamed to make Windows happy	2015-09-17 14:13:01 +02:00
zimoch	e2af7e3149	typo fixed	2015-09-15 07:21:41 +00:00
zimoch	950d75ba43	Split long_format into signed_format and unsigned_format to hangle sign extension from EPICS LONG or ULONG to long or unsigned long correctly on systems with 64 bit long.	2015-08-31 15:25:23 +00:00
zimoch	e651c99697	fix tests	2015-08-18 14:34:11 +00:00
zimoch	9694628d3f	limit number of significant half bytes in %x formats to avoid problems on 64 bit machines	2015-08-18 14:33:48 +00:00
zimoch	046582d1a0	add default choice in enum output	2015-08-18 14:32:24 +00:00
zimoch	f6f0ea9ae5	fix redirection of strings to char arrays	2015-08-18 14:30:54 +00:00
zimoch	018547cdf3	allow and document direct conversion from VAL/OVAL to integer to get more bits on 64 bit systems	2015-08-18 14:28:26 +00:00
zimoch	d763a64f03	fix for 64 bit machines	2015-08-17 13:34:00 +00:00
zimoch	cefa460a0d	find correct object code	2015-08-17 13:33:35 +00:00
zimoch	cc5948ad0b	If ai uses no conversion, transport long i/o to and from val directly. This preverves more bits on 64 bit systems than going through the 32 bit rval field.	2015-07-17 13:24:37 +00:00
zimoch	be1943a66d	fix for version check	2015-06-25 16:06:39 +00:00
zimoch	d9acb47afe	make it work with old and new version of driver.makefile	2015-06-25 16:03:49 +00:00
zimoch	b721d26fb8	avoid buffer overflow	2015-04-08 09:35:00 +00:00
zimoch	7530c7c67d	check for error condifiton	2015-04-08 09:34:46 +00:00
zimoch	824cd4d283	debug message improved	2015-04-02 13:16:22 +00:00
zimoch	2e30e7aee6	fix message when INP/OUT link is empty fix bug with formatting arrays of char as strings in redirect	2015-04-02 13:15:46 +00:00
zimoch	3a5a3e22b9	Stupid error: Minutes and seconds start from 0, not 1.	2015-02-10 16:48:39 +00:00
zimoch	51bd766ba6	Fix or rather workaround for MinGW and maybe other systems without localtime_r function	2014-06-24 13:20:19 +00:00
zimoch	0ab0d6db07	function pointer type problem fixed	2014-06-24 13:19:36 +00:00
zimoch	a12de614d6	script to make a pdf from the hrml pages	2014-05-02 15:10:18 +00:00
zimoch	240abd2788	new logo and design cleanup, printing improved	2014-05-02 15:09:49 +00:00
zimoch	e131fcb32f	new logo, png instead of gif, better quality	2014-05-02 15:08:36 +00:00
zimoch	f88f594e87	shorter header, better for printing	2014-05-02 15:07:06 +00:00
zimoch	56ef0651f2	fix for BSD Linux	2014-04-07 11:55:36 +00:00