output block data with delimiter

scpi-99 6.2.3.4 and 6.2.6 suggest returning multiple blocks is valid, so SCPI_ResultArbitraryBlockHeader() needs to insert a delimiter, other changes are: accepting _GLIBCXX_HAVE_STDBOOL_H, testing for non-NULL data in writeData(), and some spelling fixes.
j123b567 · MisterHW · Feb 1, 2022 · Feb 2, 2022 · Feb 3, 2022 · Feb 7, 2022
commit 28b17f7935b446edec4dfa85974ea1bf6fcfa1ed
diff --git a/libscpi/inc/scpi/types.h b/libscpi/inc/scpi/types.h
@@ -50,7 +50,7 @@
 extern "C" {
 #endif
 
-#if !HAVE_STDBOOL
+#if (!HAVE_STDBOOL) && (!_GLIBCXX_HAVE_STDBOOL_H)
     typedef unsigned char bool;
 #endif
 
@@ -354,7 +354,7 @@ extern "C" {
 #if USE_COMMAND_TAGS
         int32_t tag;
 #endif /* USE_COMMAND_TAGS */
-    };
+};
 
     struct _scpi_interface_t {
         scpi_error_callback_t error;
@@ -381,7 +381,7 @@ extern "C" {
         void * user_context;
         scpi_parser_state_t parser_state;
         const char * idn[4];
-        size_t arbitrary_reminding;
+        size_t arbitrary_remaining;
     };
 
     enum _scpi_array_format_t {

diff --git a/libscpi/src/parser.c b/libscpi/src/parser.c
@@ -50,11 +50,11 @@
  * Write data to SCPI output
  * @param context
  * @param data
- * @param len - lenght of data to be written
+ * @param len - length of data to be written
  * @return number of bytes written
  */
 static size_t writeData(scpi_t * context, const char * data, size_t len) {
-    if (len > 0) {
+    if ((len > 0) && (data != NULL)) {
         return context->interface->write(context, data, len);
     } else {
         return 0;
@@ -134,7 +134,7 @@ static scpi_bool_t processCommand(scpi_t * context) {
     context->cmd_error = FALSE;
     context->output_count = 0;
     context->input_count = 0;
-    context->arbitrary_reminding = 0;
+    context->arbitrary_remaining = 0;
 
     /* if callback exists - call command callback */
     if (cmd->callback != NULL) {
@@ -221,7 +221,7 @@ scpi_bool_t SCPI_Parse(scpi_t * context, char * data, int len) {
                 cmd_prev = state->programHeader;
             } else {
                 /* place undefined header with error */
-                /* calculate length of errornouse header and trim \r\n */
+                /* calculate length of errorenous header and trim \r\n */
                 size_t r2 = r;
                 while (r2 > 0 && (data[r2 - 1] == '\r' || data[r2 - 1] == '\n')) r2--;
                 SCPI_ErrorPushEx(context, SCPI_ERROR_UNDEFINED_HEADER, data, r2);
@@ -238,7 +238,7 @@ scpi_bool_t SCPI_Parse(scpi_t * context, char * data, int len) {
 
     }
 
-    /* conditionaly write new line */
+    /* conditionally write new line */
     writeNewLine(context);
 
     return result;
@@ -506,7 +506,7 @@ size_t SCPI_ResultDouble(scpi_t * context, double val) {
 }
 
 /**
- * Write string withn " to the result
+ * Write string within "" to the result
  * @param context
  * @param data
  * @return
@@ -606,6 +606,7 @@ size_t SCPI_ResultError(scpi_t * context, scpi_error_t * error) {
  * @return
  */
 size_t SCPI_ResultArbitraryBlockHeader(scpi_t * context, size_t len) {
+    size_t result = 0;
     char block_header[12];
     size_t header_len;
     block_header[0] = '#';
@@ -614,8 +615,10 @@ size_t SCPI_ResultArbitraryBlockHeader(scpi_t * context, size_t len) {
     header_len = strlen(block_header + 2);
     block_header[1] = (char) (header_len + '0');
 
-    context->arbitrary_reminding = len;
-    return writeData(context, block_header, header_len + 2);
+    context->arbitrary_remaining = len;
+    result  = writeDelimiter(context);
+    result += writeData(context, block_header, header_len + 2);
+    return result;
 }
 
 /**
@@ -627,14 +630,14 @@ size_t SCPI_ResultArbitraryBlockHeader(scpi_t * context, size_t len) {
  */
 size_t SCPI_ResultArbitraryBlockData(scpi_t * context, const void * data, size_t len) {
 
-    if (context->arbitrary_reminding < len) {
+    if (context->arbitrary_remaining < len) {
         SCPI_ErrorPush(context, SCPI_ERROR_SYSTEM_ERROR);
         return 0;
     }
 
-    context->arbitrary_reminding -= len;
+    context->arbitrary_remaining -= len;
 
-    if (context->arbitrary_reminding == 0) {
+    if (context->arbitrary_remaining == 0) {
         context->output_count++;
     }