Centralize the definitionof strndupa

Author: stevegrubb

auparse/auparse.c

@@ -1199,17 +1199,6 @@ static int str2event(char *s, au_event_t *e)
 	return 0;
 }
 
-#ifndef HAVE_STRNDUPA
-#define strndupa(s, n)								\
-	({												\
-		const char *__old = (s);					\
-		size_t __len = strnlen (__old, (n));		\
-		char *__new = (char *) alloca(__len + 1);	\
-		__new[__len] = '\0';						\
-		(char *) memcpy (__new, __old, __len);		\
-	})
-#endif
-
 /* Returns 0 on success and 1 on error */
 static int extract_timestamp(const char *b, au_event_t *e)
 {

common/common.h

@@ -23,6 +23,7 @@
 #ifndef AUDIT_COMMON_HEADER
 #define AUDIT_COMMON_HEADER
 
+#include "config.h"
 #include <limits.h> /* POSIX_HOST_NAME_MAX */
 #ifdef HAVE_ATOMIC
 #include <stdatomic.h>
@@ -46,6 +47,17 @@
 // Used in auditd-event.c and audisp.c to size buffers for formatting
 #define FORMAT_BUF_LEN (MAX_AUDIT_MESSAGE_LENGTH + _POSIX_HOST_NAME_MAX)
 
+#ifndef HAVE_STRNDUPA
+#define strndupa(s, n)                                          \
+	({                                                      \
+		const char *__old = (s);			\
+		size_t __len = strnlen (__old, (n));            \
+		char *__new = (char *) alloca(__len + 1);       \
+		__new[__len] = '\0';                            \
+		(char *) memcpy (__new, __old, __len);          \
+	})
+#endif
+
 AUDIT_HIDDEN_START
 
 char *audit_strsplit_r(char *s, char **savedpp);

src/ausearch-lol.c

@@ -162,17 +162,6 @@ static int compare_event_time(event *e1, event *e2)
 	return 0;
 }
 
-#ifndef HAVE_STRNDUPA
-#define strndupa(s, n)								\
-	({												\
-		const char *__old = (s);					\
-		size_t __len = strnlen (__old, (n));		\
-		char *__new = (char *) alloca(__len + 1);	\
-		__new[__len] = '\0';						\
-		(char *) memcpy (__new, __old, __len);		\
-	})
-#endif
-
 /*
  * This function will look at the line and pick out pieces of it.
  */