Better checking of string and memory operations.

Also, add define FORBID_STRCPY to make runtime asserts on usage of strcpy, strcat and stpcpy.

	* src/sysdep.h: Move xstrlen, xstrcmp, xstrcat, xstrncmp,
	xstrncat, xstrncpy, xstpcpy, xstpncpy, xmemcmp, xmemcpy to
	sxe-utils.h

	* src/sysdep.h (x__dirlen): always_inline..
	* src/sysdep.h (x__dirname): ditto.
	* src/sysdep.h (xdirname): ditto.

	* src/sxe-utils.h (xstrlen): move from sysdep.h
	* src/sxe-utils.h (xstrcmp): ditto.
	* src/sxe-utils.h (xstrncmp): ditto.
	* src/sxe-utils.h (xstrncat): ditto.
	* src/sxe-utils.h (xstrncpy): ditto.
	* src/sxe-utils.h (xstpcpy): ditto.
	* src/sxe-utils.h (xstpncpy): ditto.
	* src/sxe-utils.h (xmemcmp): ditto.
	* src/sxe-utils.h (xmemcpy): ditto.
	* src/sxe-utils.h (xmin_size_t): ditto.

	* src/sxe-utils.h (no_strcpy): New forbidden strcpy
	* src/sxe-utils.h (no_strcat): New forbidden strcat
	* src/sxe-utils.h (no_stpcpy): New forbidden stpcpy

Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>

diff --git a/src/sxe-utils.h b/src/sxe-utils.h
index 7f6bfe0..8bc985f 100644 (file)
--- a/src/sxe-utils.h
+++ b/src/sxe-utils.h
@@ -391,4 +391,119 @@ char *xstrdup(const char *);
 # endif         /* ERROR_CHECK_MALLOC */
 #endif /* BDWGC */
 
+\f
+/* str funs */
+#define xstrlen                strlen
+#define xstrcmp                strcmp
+#define xstrncmp       strncmp
+#define xstrncat       strncat
+
+extern_inline char*
+xstrncpy(char* target, const char*source, size_t len)
+       __attribute__((always_inline));
+extern_inline char*
+xstrncpy(char* target, const char*source, size_t len)
+{
+       *target ='\0';
+       return strncat(target,source,len-1);
+}
+
+#if !defined(FORBID_STRCPY)
+#  define xstrcat              strcat
+#  define xstrcpy              strcpy
+#  if defined(HAVE_STPCPY)
+#     define xstpcpy   stpcpy
+#   else
+extern_inline char*
+xstpcpy(char *target, const char *source)
+       __attribute__((always_inline));
+extern_inline char*
+xstpcpy(char *target, const char *source)
+{
+       char *p = target;
+       size_t len = xstrlen(source);
+
+       strcpy(target, source);
+       p += len;
+       return p;
+}
+#   endif
+#else
+#  if defined(strcpy)
+#    undef strcpy
+#  endif
+#  define strcpy  no_strcpy
+extern_inline char*
+no_strcpy(char*,const char*)
+       __attribute__((always_inline));
+extern_inline char*
+no_strcpy(char * SXE_UNUSED(target),const char * SXE_UNUSED(source))
+{
+       assert(0);
+       return NULL;
+}
+#  if defined(strcat)
+#    undef strcat
+#  endif
+#  define strcat  no_strcat
+extern_inline char*
+no_strcat(char*,const char*)
+       __attribute__((always_inline));
+extern_inline char*
+no_strcat(char * SXE_UNUSED(target), const char* SXE_UNUSED(source))
+{
+       assert(0);
+       return NULL;
+}
+#  if defined(stpcpy)
+#    undef stpcpy
+#  endif
+#  define stpcpy       no_stpcpy
+#  define xstpcpy      no_stpcpy
+extern_inline char*
+no_stpcpy(char*,const char*)
+       __attribute__((always_inline));
+extern_inline char*
+no_stpcpy(char* SXE_UNUSED(target),const char* SXE_UNUSED(source))
+{
+       assert(0);
+       return NULL;
+}
+#endif
+
+
+#if defined HAVE_STPNCPY
+# define xstpncpy      stpncpy
+#else
+extern_inline char*
+xstpncpy(char *target, const char *source, size_t len)
+       __attribute__((always_inline));
+extern_inline char*
+xstpncpy(char *target, const char *source, size_t len)
+{
+       char *p = target;
+       xstrncpy(target, source, len);
+       p += len;
+       return p;
+}
+#endif /* !HAVE_STPNCPY */
+
+#define xmemcmp                memcmp
+#define xmemcpy                memcpy
+
+
+
+extern_inline size_t
+xmin_size_t(size_t a, size_t b)
+       __attribute__((always_inline));
+extern_inline size_t
+xmin_size_t(size_t a, size_t b)
+{
+       if (a < b) {
+               return a;
+       } else {
+               return b;
+       }
+}
+
 #endif

diff --git a/src/sysdep.h b/src/sysdep.h
index 7b8fd87..4ee497d 100644 (file)
--- a/src/sysdep.h
+++ b/src/sysdep.h
@@ -177,73 +177,10 @@ extern int h_errno;
 char *xrealpath(const char *path, char restrict resolved_path[]);
 #endif
 
-extern_inline size_t xmin_size_t(size_t a, size_t b);
 extern_inline void x__dirname(char *restrict res, const char *file, size_t len);
 extern_inline size_t x__dirlen(const char *file, size_t len);
 extern_inline char *xdirname(const char *file);
 
-\f
-/* str funs */
-/* thought these were defined already :O */
-#define xstrlen                strlen
-#define xstrcmp                strcmp
-#define xstrcat                strcat
-#define xstrncmp       strncmp
-#define xstrncat       strncat
-
-extern_inline char*
-xstrncpy(char* target, const char*source, size_t len)
-{
-       *target ='\0';
-       strncat(target,source,len-1);
-}
-
-#if defined HAVE_STPCPY
-# define xstpcpy       stpcpy
-#else
-extern_inline char*
-xstpcpy(char *target, const char *source)
-       __attribute__((always_inline));
-extern_inline char*
-xstpcpy(char *target, const char *source)
-{
-       char *p = target;
-       size_t len = xstrlen(source);
-
-       strcpy(target, source);
-       p += len;
-       return p;
-}
-#endif /* !HAVE_STPCPY */
-#if defined HAVE_STPNCPY
-# define xstpncpy      stpncpy
-#else
-extern_inline char*
-xstpncpy(char *target, const char *source, size_t len)
-       __attribute__((always_inline));
-extern_inline char*
-xstpncpy(char *target, const char *source, size_t len)
-{
-       char *p = target;
-       xstrncpy(target, source, len);
-       p += len;
-       return p;
-}
-#endif /* !HAVE_STPNCPY */
-
-#define xmemcmp                memcmp
-#define xmemcpy                memcpy
-
-extern_inline size_t
-xmin_size_t(size_t a, size_t b)
-{
-       if (a < b) {
-               return a;
-       } else {
-               return b;
-       }
-}
-
 \f
 /* big dirname magic, some of it stolen from dirname.c from coreutils 6.9 */
 /* POSIX says:
@@ -264,6 +201,9 @@ xmin_size_t(size_t a, size_t b)
 #define ISSLASH(C)     ((C) == DIRECTORY_SEPARATOR)
 #endif
 
+extern_inline size_t
+x__dirlen(const char *file, size_t len)
+       __attribute__((always_inline));
 extern_inline size_t
 x__dirlen(const char *file, size_t len)
 {
@@ -280,6 +220,9 @@ x__dirlen(const char *file, size_t len)
        return len;
 }
 
+extern_inline void
+x__dirname(char *restrict res, const char *file, size_t len)
+       __attribute__((always_inline));
 #if defined(HAVE_DIRNAME) && defined(DIRNAME_SIDE_EFFECT)
 extern_inline void
 x__dirname(char *restrict res, const char *file, size_t len)
@@ -312,6 +255,9 @@ x__dirname(char *restrict res, const char *file, size_t len)
 }
 #endif
 
+extern_inline char*
+xdirname(const char *file)
+       __attribute__((always_inline));
 extern_inline char*
 xdirname(const char *file)
 {