6.9.0

examples/arm-cm/dpp_efm32-slstk3401a/qview/qview-dpp.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp.py
+python3 %QTOOLS%\qview\qview.py dpp.py
 
 @endlocal

examples/arm-cm/dpp_efm32-slstk3401a/qview/qview-dpp1.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp1.py
+python3 %QTOOLS%\qview\qview.py dpp1.py
 
 @endlocal

examples/arm-cm/dpp_ek-tm4c123gxl/qview/qview-dpp.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp.py
+python3 %QTOOLS%\qview\qview.py dpp.py
 
 @endlocal

examples/arm-cm/dpp_ek-tm4c123gxl/qview/qview-dpp1.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp1.py
+python3 %QTOOLS%\qview\qview.py dpp1.py
 
 @endlocal

examples/arm-cm/dpp_nucleo-h743zi/qview/qview-dpp.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp.py
+python3 %QTOOLS%\qview\qview.py dpp.py
 
 @endlocal

examples/arm-cm/dpp_nucleo-h743zi/qview/qview-dpp1.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp1.py
+python3 %QTOOLS%\qview\qview.py dpp1.py
 
 @endlocal

examples/arm-cm/dpp_nucleo-l053r8/qview/qview-dpp.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp.py
+python3 %QTOOLS%\qview\qview.py dpp.py
 
 @endlocal

examples/arm-cm/dpp_nucleo-l053r8/qview/qview-dpp1.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp1.py
+python3 %QTOOLS%\qview\qview.py dpp1.py
 
 @endlocal

examples/arm-cm/dpp_nucleo-l152re/qview/qview-dpp.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp.py
+python3 %QTOOLS%\qview\qview.py dpp.py
 
 @endlocal

examples/arm-cm/dpp_nucleo-l152re/qview/qview-dpp1.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp1.py
+python3 %QTOOLS%\qview\qview.py dpp1.py
 
 @endlocal

examples/arm-cr/dpp_launchxl2-tms57012/qview/qview-dpp.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp.py
+python3 %QTOOLS%\qview\qview.py dpp.py
 
 @endlocal

examples/arm-cr/dpp_launchxl2-tms57012/qview/qview-dpp1.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp1.py
+python3 %QTOOLS%\qview\qview.py dpp1.py
 
 @endlocal

examples/qutest/blinky/test/Makefile

@@ -148,7 +148,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/blinky/test/make_efm32

@@ -193,7 +193,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/blinky/test/make_tm4c123

@@ -191,7 +191,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/dpp/test_dpp/Makefile

@@ -150,7 +150,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/dpp/test_dpp/make_efm32

@@ -195,7 +195,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/dpp/test_dpp/make_tm4c123

@@ -193,7 +193,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/dpp/test_philo/Makefile

@@ -148,7 +148,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/dpp/test_table/Makefile

@@ -148,7 +148,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/evt_par/test/Makefile

@@ -147,7 +147,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/evt_par/test/make_tm4c123

@@ -190,7 +190,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/qhsmtst/test/Makefile

@@ -147,7 +147,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/qhsmtst/test/make_efm32

@@ -192,7 +192,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/qhsmtst/test/make_tm4c123

@@ -190,7 +190,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/qmsmtst/test/Makefile

@@ -147,7 +147,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/qmsmtst/test/make_efm32

@@ -192,7 +192,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/qmsmtst/test/make_tm4c123

@@ -190,7 +190,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/self_test/test/Makefile

@@ -146,7 +146,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/self_test/test/make_efm32

@@ -191,7 +191,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/self_test/test/make_tm4c123

@@ -189,7 +189,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/unity_basic/test/Makefile

@@ -147,7 +147,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/unity_basic/test/make_efm32

@@ -192,7 +192,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/unity_basic/test/make_tm4c123

@@ -190,7 +190,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/unity_basic/test/test_ProductionCode.py

@@ -40,24 +40,24 @@ expect("@timestamp Trg-Done QS_RX_COMMAND")
 
 test("FunctionWhichReturnsLocalVariable() Should Return The Current Counter Value")
 command(1)
-expect("@timestamp USER+001 FunctionWhichReturnsLocalVariable 0x5A5A")
+expect("@timestamp USER+001 FunctionWhichReturnsLocalVariab 0x5A5A")
 expect("@timestamp Trg-Done QS_RX_COMMAND")
 # This should be true because we can still change our answer
 poke(0, 4, pack('<L', 0x1234))
 command(1)
-expect("@timestamp USER+001 FunctionWhichReturnsLocalVariable 0x1234")
+expect("@timestamp USER+001 FunctionWhichReturnsLocalVariab 0x1234")
 expect("@timestamp Trg-Done QS_RX_COMMAND")
 
 test("FunctionWhichReturnsLocalVariable() Should Return The Current Counter Value Again", NORESET)
 # This should be true again because setup was rerun before this test (and after we changed it to 0x1234)
 command(1)
-expect("@timestamp USER+001 FunctionWhichReturnsLocalVariable 0x5A5A")
+expect("@timestamp USER+001 FunctionWhichReturnsLocalVariab 0x5A5A")
 expect("@timestamp Trg-Done QS_RX_COMMAND")
 
 test("FunctionWhichReturnsLocalVariable() Should Return Current Counter, But Fails Because This Test Is Actually Flawed", NORESET)
 # Sometimes you get the test wrong.  When that happens, you get a failure too... and a quick look should tell
 # you what actually happened...which in this case was a failure to setup the initial condition.
 command(1)
-expect("@timestamp USER+001 FunctionWhichReturnsLocalVariable 0x1234")
+expect("@timestamp USER+001 FunctionWhichReturnsLocalVariab 0x1234")
 expect("@timestamp Trg-Done QS_RX_COMMAND")
 

examples/qutest/unity_mock/test/Makefile

@@ -148,7 +148,7 @@ LINK  := gcc    # for C programs
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/unity_mock/test/make_efm32

@@ -193,7 +193,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/qutest/unity_mock/test/make_tm4c123

@@ -191,7 +191,7 @@ RM    := rm
 # QUTest test script utilities (requires QTOOLS):
 #
 ifeq ("$(wildcard $(QUTEST))","")
-QUTEST := python $(QTOOLS)/qutest/qutest.py
+QUTEST := python3 $(QTOOLS)/qutest/qutest.py
 endif
 
 TESTS  := *.py

examples/workstation/calc/bsp.c

@@ -1,7 +1,7 @@
 /*****************************************************************************
 * Product: Board Support Package (BSP) for the Calculator example
-* Last updated for version 6.8.2
-* Last updated on  2020-06-22
+* Last updated for version 6.9.0
+* Last updated on  2020-06-24
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
@@ -108,7 +108,7 @@ int BSP_eval(double operand1, int oper, double operand2) {
             }
             else {
                 /* error: divide by zero */
-                STRCPY_S(l_display, DISP_WIDTH, " Error 0 ");
+                STRNCPY_S(l_display, DISP_WIDTH, " Error 0 ");
                 ok = 0;
             }
             break;
@@ -123,7 +123,7 @@ int BSP_eval(double operand1, int oper, double operand2) {
         }
         else {
             /* error: out of range */
-            STRCPY_S(l_display, DISP_WIDTH, " Error 1 ");
+            STRNCPY_S(l_display, DISP_WIDTH, " Error 1 ");
             ok = 0;
         }
     }

examples/workstation/calc1/bsp.c

@@ -1,7 +1,7 @@
 /*****************************************************************************
 * Product: Board Support Package (BSP) for the Calculator example
-* Last updated for version 6.8.2
-* Last updated on  2020-06-22
+* Last updated for version 6.9.0
+* Last updated on  2020-06-24
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
@@ -72,7 +72,7 @@ void BSP_display(double value) {
 }
 /*..........................................................................*/
 void BSP_display_error(char const *err) {
-    STRCPY_S(l_display, DISP_WIDTH, err);
+    STRNCPY_S(l_display, DISP_WIDTH, err);
 }
 /*..........................................................................*/
 void BSP_negate(void) {
@@ -113,7 +113,8 @@ void QF_onClockTick(void) {
 
 /*..........................................................................*/
 /* this function is used by the QP embedded systems-friendly assertions */
-Q_NORETURN Q_onAssert(char_t const * const file, int_t const line) {
-    FPRINTF_S(stderr, "Assertion failed in %s, line %d", file, line);
+Q_NORETURN Q_onAssert(char const * const module, int_t const loc) {
+    FPRINTF_S(stderr, "Assertion failed in %s:%d", module, loc);
+    QF_onCleanup();
     exit(-1);
 }

examples/workstation/calc1_sub/bsp.c

@@ -1,7 +1,7 @@
 /*****************************************************************************
 * Product: Board Support Package (BSP) for the Calculator example
-* Last updated for version 6.8.2
-* Last updated on  2020-06-22
+* Last updated for version 6.9.0
+* Last updated on  2020-06-24
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
@@ -72,7 +72,7 @@ void BSP_display(double value) {
 }
 /*..........................................................................*/
 void BSP_display_error(char const *err) {
-    STRCPY_S(l_display, DISP_WIDTH, err);
+    STRNCPY_S(l_display, DISP_WIDTH, err);
 }
 /*..........................................................................*/
 void BSP_negate(void) {
@@ -113,7 +113,8 @@ void QF_onClockTick(void) {
 
 /*..........................................................................*/
 /* this function is used by the QP embedded systems-friendly assertions */
-Q_NORETURN Q_onAssert(char_t const * const file, int_t const line) {
-    FPRINTF_S(stderr, "Assertion failed in %s, line %d", file, line);
+Q_NORETURN Q_onAssert(char const * const module, int_t const loc) {
+    FPRINTF_S(stderr, "Assertion failed in %s:%d", module, loc);
+    QF_onCleanup();
     exit(-1);
 }

examples/workstation/dpp/qview/qview-dpp.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp.py
+python3 %QTOOLS%\qview\qview.py dpp.py
 
 @endlocal

examples/workstation/dpp/qview/qview-dpp1.bat

@@ -3,6 +3,6 @@
 if "%QTOOLS%"=="" (
     set QTOOLS=C:\qp\qtools
 )
-python %QTOOLS%\qview\qview.py dpp1.py
+python3 %QTOOLS%\qview\qview.py dpp1.py
 
 @endlocal

ports/posix-qutest/qutest_port.c

@@ -4,8 +4,8 @@
 * @ingroup ports
 * @cond
 ******************************************************************************
-* Last updated for version 6.8.0
-* Last updated on  2020-03-31
+* Last updated for version 6.9.0
+* Last updated on  2020-08-24
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
@@ -205,7 +205,7 @@ void QS_onFlush(void) {
     static struct timespec const c_timeout = { 0, QS_TIMEOUT_MS*1000000L };
 
     if (l_sock == INVALID_SOCKET) { /* socket NOT initialized? */
-        FPRINTF_S(stderr, "<TARGET> ERROR   invalid TCP socket\n");
+        FPRINTF_S(stderr, "%s\n", "<TARGET> ERROR   invalid TCP socket");
         return;
     }
 

ports/posix-qutest/safe_std.h

@@ -5,7 +5,7 @@
 * @cond
 ******************************************************************************
 * Last updated for version 6.9.0
-* Last updated on  2020-08-22
+* Last updated on  2020-08-24
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
@@ -49,8 +49,8 @@
 #define MEMMOVE_S(dest_, num_, src_, count_) \
     memmove_s(dest_, num_, src_, count_)
 
-#define STRCPY_S(dest_, destsiz_, src_) \
-    strcpy_s(dest_, destsiz_, src_)
+#define STRNCPY_S(dest_, destsiz_, src_) \
+    strncpy_s(dest_, destsiz_, src_, _TRUNCATE)
 
 #define STRCAT_S(dest_, destsiz_, src_) \
     strcat_s(dest_, destsiz_, src_)
@@ -85,8 +85,10 @@ if (fopen_s(&fp_, fName_, mode_) != 0) { \
 #define MEMMOVE_S(dest_, num_, src_, count_) \
     memmove(dest_, src_, count_)
 
-#define STRCPY_S(dest_, destsiz_, src_) \
-    strcpy(dest_, src_)
+#define STRNCPY_S(dest_, destsiz_, src_) do { \
+    strncpy(dest_, src_, destsiz_);           \
+    dest_[(destsiz_) - 1] = '\0';             \
+} while (false)
 
 #define STRCAT_S(dest_, destsiz_, src_) \
     strcat(dest_, src_)

ports/posix-qv/safe_std.h

@@ -5,7 +5,7 @@
 * @cond
 ******************************************************************************
 * Last updated for version 6.9.0
-* Last updated on  2020-08-22
+* Last updated on  2020-08-24
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
@@ -49,8 +49,8 @@
 #define MEMMOVE_S(dest_, num_, src_, count_) \
     memmove_s(dest_, num_, src_, count_)
 
-#define STRCPY_S(dest_, destsiz_, src_) \
-    strcpy_s(dest_, destsiz_, src_)
+#define STRNCPY_S(dest_, destsiz_, src_) \
+    strncpy_s(dest_, destsiz_, src_, _TRUNCATE)
 
 #define STRCAT_S(dest_, destsiz_, src_) \
     strcat_s(dest_, destsiz_, src_)
@@ -85,8 +85,10 @@ if (fopen_s(&fp_, fName_, mode_) != 0) { \
 #define MEMMOVE_S(dest_, num_, src_, count_) \
     memmove(dest_, src_, count_)
 
-#define STRCPY_S(dest_, destsiz_, src_) \
-    strcpy(dest_, src_)
+#define STRNCPY_S(dest_, destsiz_, src_) do { \
+    strncpy(dest_, src_, destsiz_);           \
+    dest_[(destsiz_) - 1] = '\0';             \
+} while (false)
 
 #define STRCAT_S(dest_, destsiz_, src_) \
     strcat(dest_, src_)

ports/posix/safe_std.h

@@ -5,7 +5,7 @@
 * @cond
 ******************************************************************************
 * Last updated for version 6.9.0
-* Last updated on  2020-08-22
+* Last updated on  2020-08-24
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
@@ -49,8 +49,8 @@
 #define MEMMOVE_S(dest_, num_, src_, count_) \
     memmove_s(dest_, num_, src_, count_)
 
-#define STRCPY_S(dest_, destsiz_, src_) \
-    strcpy_s(dest_, destsiz_, src_)
+#define STRNCPY_S(dest_, destsiz_, src_) \
+    strncpy_s(dest_, destsiz_, src_, _TRUNCATE)
 
 #define STRCAT_S(dest_, destsiz_, src_) \
     strcat_s(dest_, destsiz_, src_)
@@ -85,8 +85,10 @@ if (fopen_s(&fp_, fName_, mode_) != 0) { \
 #define MEMMOVE_S(dest_, num_, src_, count_) \
     memmove(dest_, src_, count_)
 
-#define STRCPY_S(dest_, destsiz_, src_) \
-    strcpy(dest_, src_)
+#define STRNCPY_S(dest_, destsiz_, src_) do { \
+    strncpy(dest_, src_, destsiz_);           \
+    dest_[(destsiz_) - 1] = '\0';             \
+} while (false)
 
 #define STRCAT_S(dest_, destsiz_, src_) \
     strcat(dest_, src_)

ports/win32-qutest/safe_std.h

@@ -5,7 +5,7 @@
 * @cond
 ******************************************************************************
 * Last updated for version 6.9.0
-* Last updated on  2020-08-22
+* Last updated on  2020-08-24
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
@@ -49,8 +49,8 @@
 #define MEMMOVE_S(dest_, num_, src_, count_) \
     memmove_s(dest_, num_, src_, count_)
 
-#define STRCPY_S(dest_, destsiz_, src_) \
-    strcpy_s(dest_, destsiz_, src_)
+#define STRNCPY_S(dest_, destsiz_, src_) \
+    strncpy_s(dest_, destsiz_, src_, _TRUNCATE)
 
 #define STRCAT_S(dest_, destsiz_, src_) \
     strcat_s(dest_, destsiz_, src_)
@@ -85,8 +85,10 @@ if (fopen_s(&fp_, fName_, mode_) != 0) { \
 #define MEMMOVE_S(dest_, num_, src_, count_) \
     memmove(dest_, src_, count_)
 
-#define STRCPY_S(dest_, destsiz_, src_) \
-    strcpy(dest_, src_)
+#define STRNCPY_S(dest_, destsiz_, src_) do { \
+    strncpy(dest_, src_, destsiz_);           \
+    dest_[(destsiz_) - 1] = '\0';             \
+} while (false)
 
 #define STRCAT_S(dest_, destsiz_, src_) \
     strcat(dest_, src_)

ports/win32-qv/safe_std.h

@@ -5,7 +5,7 @@
 * @cond
 ******************************************************************************
 * Last updated for version 6.9.0
-* Last updated on  2020-08-22
+* Last updated on  2020-08-24
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
@@ -49,8 +49,8 @@
 #define MEMMOVE_S(dest_, num_, src_, count_) \
     memmove_s(dest_, num_, src_, count_)
 
-#define STRCPY_S(dest_, destsiz_, src_) \
-    strcpy_s(dest_, destsiz_, src_)
+#define STRNCPY_S(dest_, destsiz_, src_) \
+    strncpy_s(dest_, destsiz_, src_, _TRUNCATE)
 
 #define STRCAT_S(dest_, destsiz_, src_) \
     strcat_s(dest_, destsiz_, src_)
@@ -85,8 +85,10 @@ if (fopen_s(&fp_, fName_, mode_) != 0) { \
 #define MEMMOVE_S(dest_, num_, src_, count_) \
     memmove(dest_, src_, count_)
 
-#define STRCPY_S(dest_, destsiz_, src_) \
-    strcpy(dest_, src_)
+#define STRNCPY_S(dest_, destsiz_, src_) do { \
+    strncpy(dest_, src_, destsiz_);           \
+    dest_[(destsiz_) - 1] = '\0';             \
+} while (false)
 
 #define STRCAT_S(dest_, destsiz_, src_) \
     strcat(dest_, src_)

ports/win32/safe_std.h

@@ -5,7 +5,7 @@
 * @cond
 ******************************************************************************
 * Last updated for version 6.9.0
-* Last updated on  2020-08-22
+* Last updated on  2020-08-24
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
@@ -49,8 +49,8 @@
 #define MEMMOVE_S(dest_, num_, src_, count_) \
     memmove_s(dest_, num_, src_, count_)
 
-#define STRCPY_S(dest_, destsiz_, src_) \
-    strcpy_s(dest_, destsiz_, src_)
+#define STRNCPY_S(dest_, destsiz_, src_) \
+    strncpy_s(dest_, destsiz_, src_, _TRUNCATE)
 
 #define STRCAT_S(dest_, destsiz_, src_) \
     strcat_s(dest_, destsiz_, src_)
@@ -85,8 +85,10 @@ if (fopen_s(&fp_, fName_, mode_) != 0) { \
 #define MEMMOVE_S(dest_, num_, src_, count_) \
     memmove(dest_, src_, count_)
 
-#define STRCPY_S(dest_, destsiz_, src_) \
-    strcpy(dest_, src_)
+#define STRNCPY_S(dest_, destsiz_, src_) do { \
+    strncpy(dest_, src_, destsiz_);           \
+    dest_[(destsiz_) - 1] = '\0';             \
+} while (false)
 
 #define STRCAT_S(dest_, destsiz_, src_) \
     strcat(dest_, src_)