Changeset 42378 for trunk/psLib/src/sys/psString.c

Timestamp:

Feb 8, 2023, 11:51:50 AM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. deal with more restrictive gcc / autoconf: add no_warn version of strncpy; mysql removes my_bool after v8.0.0

Location:

trunk/psLib

Files:

• . (modified) (1 prop)
• src/sys/psString.c (modified) (1 diff)

trunk/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,