6.9.0

QL · QL · commit 11d20031f1f2 · 2020-08-25T10:18:50.000-04:00
diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/qview/qview-dpp.bat b/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
diff --git a/examples/arm-cm/dpp_efm32-slstk3401a/qview/qview-dpp1.bat b/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
diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/qview/qview-dpp.bat b/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
diff --git a/examples/arm-cm/dpp_ek-tm4c123gxl/qview/qview-dpp1.bat b/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
diff --git a/examples/arm-cm/dpp_nucleo-h743zi/qview/qview-dpp.bat b/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
diff --git a/examples/arm-cm/dpp_nucleo-h743zi/qview/qview-dpp1.bat b/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
diff --git a/examples/arm-cm/dpp_nucleo-l053r8/qview/qview-dpp.bat b/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
diff --git a/examples/arm-cm/dpp_nucleo-l053r8/qview/qview-dpp1.bat b/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
diff --git a/examples/arm-cm/dpp_nucleo-l152re/qview/qview-dpp.bat b/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
diff --git a/examples/arm-cm/dpp_nucleo-l152re/qview/qview-dpp1.bat b/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
diff --git a/examples/arm-cm/dpp_stm32f746g-discovery/qview/qview-dpp.bat b/examples/arm-cm/dpp_stm32f746g-discovery/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
diff --git a/examples/arm-cm/dpp_stm32f746g-discovery/qview/qview-dpp1.bat b/examples/arm-cm/dpp_stm32f746g-discovery/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
diff --git a/examples/arm-cr/dpp_launchxl2-tms57012/qview/qview-dpp.bat b/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
diff --git a/examples/arm-cr/dpp_launchxl2-tms57012/qview/qview-dpp1.bat b/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
diff --git a/examples/qutest/blinky/test/Makefile b/examples/qutest/blinky/test/Makefile
@@ -147,7 +147,7 @@ LINK  := g++   # 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
diff --git a/examples/qutest/blinky/test/make_efm32 b/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
diff --git a/examples/qutest/blinky/test/make_tm4c123 b/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
diff --git a/examples/qutest/dpp/test_dpp/Makefile b/examples/qutest/dpp/test_dpp/Makefile
@@ -149,7 +149,7 @@ LINK  := g++   # 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
diff --git a/examples/qutest/dpp/test_dpp/make_efm32 b/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
diff --git a/examples/qutest/dpp/test_dpp/make_tm4c123 b/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
diff --git a/examples/qutest/dpp/test_philo/Makefile b/examples/qutest/dpp/test_philo/Makefile
@@ -147,7 +147,7 @@ LINK  := g++   # 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
diff --git a/examples/qutest/dpp/test_table/Makefile b/examples/qutest/dpp/test_table/Makefile
@@ -147,7 +147,7 @@ LINK  := g++   # 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
diff --git a/examples/qutest/evt_par/test/Makefile b/examples/qutest/evt_par/test/Makefile
@@ -146,7 +146,7 @@ LINK  := g++   # 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
diff --git a/examples/qutest/evt_par/test/make_tm4c123 b/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
diff --git a/examples/qutest/qhsmtst/test/Makefile b/examples/qutest/qhsmtst/test/Makefile
@@ -146,7 +146,7 @@ LINK  := g++   # 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
diff --git a/examples/qutest/qhsmtst/test/make_tm4c123 b/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
diff --git a/examples/qutest/qmsmtst/test/Makefile b/examples/qutest/qmsmtst/test/Makefile
@@ -146,7 +146,7 @@ LINK  := g++   # 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
diff --git a/examples/qutest/qmsmtst/test/make_tm4c123 b/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
diff --git a/examples/qutest/self_test/test/Makefile b/examples/qutest/self_test/test/Makefile
@@ -145,7 +145,7 @@ LINK  := g++   # 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
diff --git a/examples/workstation/calc/bsp.cpp b/examples/workstation/calc/bsp.cpp
@@ -1,13 +1,13 @@
 //****************************************************************************
 // Product: Board Support Package (BSP) for the Calculator example
-// Last Updated for Version: 6.8.2
-// Date of the Last Update:  2020-06-22
+// Last Updated for Version: 6.9.0
+// Date of the Last Update:  2020-08-25
 //
 //                    Q u a n t u m  L e a P s
 //                    ------------------------
 //                    Modern Embedded Software
 //
-// Copyright (C) 2005-2018 Quantum Leaps, LLC. All rights reserved.
+// Copyright (C) 2005-2020 Quantum Leaps, LLC. All rights reserved.
 //
 // This program is open source software: you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as published
@@ -111,7 +111,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;
@@ -126,7 +126,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;
         }
     }
diff --git a/examples/workstation/calc1/bsp.cpp b/examples/workstation/calc1/bsp.cpp
@@ -1,7 +1,7 @@
 //****************************************************************************
 // Product: Board Support Package (BSP) for the Calculator example
-// Last Updated for Version: 6.8.2
-// Date of the Last Update:  2020-06-22
+// Last Updated for Version: 6.9.0
+// Date of the Last Update:  2020-08-25
 //
 //                    Q u a n t u m  L e a P s
 //                    ------------------------
@@ -74,7 +74,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) {
diff --git a/examples/workstation/calc1_sub-me/bsp.cpp b/examples/workstation/calc1_sub-me/bsp.cpp
@@ -1,7 +1,7 @@
 //****************************************************************************
 // Product: Board Support Package (BSP) for the Calculator example
-// Last Updated for Version: 6.8.2
-// Date of the Last Update:  2020-06-22
+// Last Updated for Version: 6.9.0
+// Date of the Last Update:  2020-08-25
 //
 //                    Q u a n t u m  L e a P s
 //                    ------------------------
@@ -74,7 +74,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) {
diff --git a/examples/workstation/calc1_sub/bsp.cpp b/examples/workstation/calc1_sub/bsp.cpp
@@ -1,7 +1,7 @@
 //****************************************************************************
 // Product: Board Support Package (BSP) for the Calculator example
-// Last Updated for Version: 6.8.2
-// Date of the Last Update:  2020-06-22
+// Last Updated for Version: 6.9.0
+// Date of the Last Update:  2020-08-25
 //
 //                    Q u a n t u m  L e a P s
 //                    ------------------------
@@ -74,7 +74,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) {
diff --git a/examples/workstation/dpp/qview/qview-dpp.bat b/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
diff --git a/examples/workstation/dpp/qview/qview-dpp1.bat b/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
diff --git a/ports/posix-qutest/safe_std.h b/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_)
diff --git a/ports/posix-qv/safe_std.h b/ports/posix-qv/safe_std.h
diff --git a/ports/posix/safe_std.h b/ports/posix/safe_std.h
diff --git a/ports/win32-qutest/safe_std.h b/ports/win32-qutest/safe_std.h
diff --git a/ports/win32-qv/safe_std.h b/ports/win32-qv/safe_std.h
diff --git a/ports/win32/safe_std.h b/ports/win32/safe_std.h

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`if "%QTOOLS%"=="" (`
`4`	`4`	`set QTOOLS=C:\qp\qtools`
`5`	`5`	`)`
`6`		`-python %QTOOLS%\qview\qview.py dpp.py`
	`6`	`+python3 %QTOOLS%\qview\qview.py dpp.py`
`7`	`7`
`8`	`8`	`@endlocal`