COMMON: Fixes TSAVE of arrays includes extra null character. #119

Author: chrisws

ChangeLog

@@ -1,5 +1,6 @@
 2021-06-05 (12.22)
 	COMMON: Fixes 'Socket Client doesn't receive byte with value 13' #112
+	COMMON: Fixes TSAVE of arrays includes extra null character. #119
 
 2021-05-03 (12.22)
 	COMMON: Fix array access regression

src/common/blib.c

@@ -530,7 +530,7 @@ void cmd_print(int output) {
     if (code_peek() == kwTYPE_EOC || code_peek() == kwTYPE_LINE) {
       // There are no parameters
       if (dev_fstatus(handle)) {
-        dev_fwrite(handle, (byte *)OS_LINESEPARATOR, sizeof(OS_LINESEPARATOR));
+        dev_fwrite(handle, (byte *)OS_LINESEPARATOR, OS_LINESEPARATOR_LEN);
       } else {
         err_fopen();
       }

src/common/blib_db.c

@@ -725,7 +725,7 @@ void cmd_fsaveln() {
     for (int i = 0; i < v_asize(array_p); i++) {
       var_p = v_elem(array_p, i);
       fprint_var(handle, var_p);
-      dev_fwrite(handle, (byte *)OS_LINESEPARATOR, sizeof(OS_LINESEPARATOR));
+      dev_fwrite(handle, (byte *)OS_LINESEPARATOR, OS_LINESEPARATOR_LEN);
     }
   } else {
     // parameter is an string

src/common/scan.c

@@ -25,7 +25,6 @@ bcip_t comp_search_bc(bcip_t ip, code_t code);
 bcip_t comp_next_bc_cmd(bc_t *bc, bcip_t ip);
 extern void expr_parser(bc_t *bc);
 
-#define STRLEN(s) ((sizeof(s) / sizeof(s[0])) - 1)
 const int LEN_OPTION     = STRLEN(LCN_OPTION);
 const int LEN_IMPORT     = STRLEN(LCN_IMPORT_WRS);
 const int LEN_UNIT       = STRLEN(LCN_UNIT_WRS);

src/common/sys.h

@@ -60,6 +60,9 @@ extern "C" {
  #define OS_LINESEPARATOR  "\n"
 #endif
 
+#define STRLEN(s) ((sizeof(s) / sizeof(s[0])) - 1)
+#define OS_LINESEPARATOR_LEN STRLEN(OS_LINESEPARATOR)
+
 #if UINTPTR_MAX == 0xffffffff
   #define SB_BIT_SZ "_32 "
 #else