Changeset 42346

Timestamp:

Feb 1, 2023, 4:13:02 PM (3 years ago)

Author:

eugene

Message:

add ps_strncpy_nowarn to handle overly-strict gcc version 9

Location:

branches/eam_branches/ipp-20220316/psLib/src/sys

Files:

• psString.c (modified) (1 diff)
• psString.h (modified) (1 diff)
• psTrace.c (modified) (1 diff)

branches/eam_branches/ipp-20220316/psLib/src/sys/psString.c

@@ -41 +41 @@
 
 
+// gcc (Ubuntu 20.04) complains when strncpy is used to copy a fraction of a buffer,
+// potentially skipping the ending NULL.  To avoid the error, manually copy
+// and (to ensure the buffer ends in a NULL) set the last + 1 byte to NUL: 
+// WARNING : len(dest) must be >= n + 1
+char *ps_strncpy_nowarn (char *dest, const char *src, size_t n) {
+
+  size_t i;
+  
+  char *d = dest;
+  char *s = (char *) src;
+  for (i = 0; i < n && *s != 0; i++, d++, s++) { *d = *s; }
+  for ( ; i <= n; i++, d++) { *d = 0; }
+  
+  return dest;
+}
+
 psString p_psStringAlloc(const char *file,
                          unsigned int lineno,

branches/eam_branches/ipp-20220316/psLib/src/sys/psString.h

@@ -48 +48 @@
 void psNOOP (void);
 
+char *ps_strncpy_nowarn (char *dest, const char *src, size_t n);
+
 // some constants to use in snprintf statements and variable definitions to ensure
 // consistency

branches/eam_branches/ipp-20220316/psLib/src/sys/psTrace.c

@@ -213 +213 @@
     }
 
-    strncpy(name, addNodeName, MAX_COMPONENT_LENGTH);
+    ps_strncpy_nowarn(name, addNodeName, MAX_COMPONENT_LENGTH);
     char *pname = name+1;               // Take off the period
     // Iterate through the components of addNodeName.  Strip off the first