core-builtin: add and use built in shim wrapper for strchr

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>

Author: ColinIanKing

Makefile.config

@@ -2639,6 +2639,7 @@ functions: \
 	BUILTIN_SQRTL \
 	BUILTIN_STDC_ROTATE_LEFT \
 	BUILTIN_STDC_ROTATE_RIGHT \
+	BUILTIN_STRCHR \
 	BUILTIN_STRCMP \
 	BUILTIN_STRDUP \
 	BUILTIN_STRNCMP \
@@ -3724,6 +3725,9 @@ BUILTIN_STDC_ROTATE_RIGHT:
 BUILTIN_SQRTL:
 	$(call check,test-mathfunc,HAVE_BUILTIN_SQRTL,__builtin_sqrtl,$(LIB_M),-DMATHFUNC=__builtin_sqrtl)
 
+BUILTIN_STRCHR:
+	$(call check,test-builtin-strchr,HAVE_BUILTIN_STRCHR,__builtin_strchr)
+
 BUILTIN_STRCMP:
 	$(call check,test-builtin-strcmp,HAVE_BUILTIN_STRCMP,__builtin_strcmp)
 

core-builtin.h

@@ -61,6 +61,12 @@
 #define	shim_strdup(str)		strdup((str))
 #endif
 
+#if defined(HAVE_BUILTIN_STRCHR)
+#define shim_strchr(str, c)		__builtin_strchr((str), (c))
+#else
+#define shim_strchr(str, c)		strchr((str), (c))
+#endif
+
 #if defined(HAVE_BUILTIN_STRCMP)
 #define shim_strcmp(s1, s2)		__builtin_strcmp((s1), (s2))
 #else

core-cpu-cache.c

@@ -71,7 +71,7 @@ static int stress_get_string_from_file(
 	if (UNLIKELY(ret < 0))
 		return -1;
 
-	ptr = strchr(tmp, '\n');
+	ptr = shim_strchr(tmp, '\n');
 	if (ptr)
 		*ptr = '\0';
 
@@ -261,7 +261,7 @@ static int stress_cpu_cache_get_alpha(
 			} else {
 				continue;
 			}
-			ptr = strchr(buffer, ':');
+			ptr = shim_strchr(buffer, ':');
 			if (!ptr)
 				continue;
 			ptr++;
@@ -687,7 +687,7 @@ static int stress_cpu_cache_get_sh4(stress_cpu_cache_cpu_t *cpu)
 
 	(void)shim_memset(buffer, 0, sizeof(buffer));
 	while ((cpu->cache_count < 2) && fgets(buffer, sizeof(buffer), fp) != NULL) {
-		const char *ptr = strchr(buffer, ':');
+		const char *ptr = shim_strchr(buffer, ':');
 
 		if (ptr &&
 		    (shim_strncmp("cache size", buffer + 1, 10) == 0) &&

core-cpuidle.c

@@ -149,7 +149,7 @@ void stress_cpuidle_init(void)
 			(void)snprintf(path, sizeof(path), "%s/%s/name", cpuidle_path, cpuidle_d->d_name);
 			if (stress_fs_file_read(path, data, sizeof(data)) < 1)
 				continue;
-			ptr = strchr(data, '\n');
+			ptr = shim_strchr(data, '\n');
 			if (ptr)
 				*ptr = '\0';
 
@@ -244,7 +244,7 @@ static void stress_cpuidle_read_cstates(
 			(void)snprintf(path, sizeof(path), "%s/%s/name", cpuidle_path, cpuidle_d->d_name);
 			if (stress_fs_file_read(path, cstate, sizeof(cstate)) < 1)
 				continue;
-			ptr = strchr(cstate, '\n');
+			ptr = shim_strchr(cstate, '\n');
 			if (ptr)
 				*ptr = '\0';
 

core-helper.c

@@ -1673,7 +1673,7 @@ char *stress_proc_self_exe_get(char *path, const size_t path_len)
 	(void)stress_proc_self_exe_path_get;
 
 	/* A plain filename is invalid if the program has been found in the PATH */
-	if (!strchr(program_invocation_name, '/'))
+	if (!shim_strchr(program_invocation_name, '/'))
 		return NULL;
 
 	/* this may return the wrong name if it's been argv modified */

core-job.c

@@ -35,7 +35,7 @@
  */
 static inline void stress_str_chop(char *str, const char ch)
 {
-	char * const ptr = strchr(str, ch);
+	char * const ptr = shim_strchr(str, ch);
 
 	if (ptr)
 		*ptr = '\0';

core-klog.c

@@ -164,11 +164,11 @@ void stress_klog_start(void)
 			const char *msg;
 			bool dump_procs = false;
 
-			ptr = strchr(buf, '\n');
+			ptr = shim_strchr(buf, '\n');
 			if (ptr)
 				*ptr = '\0';
 
-			ptr = strchr(buf, ';');
+			ptr = shim_strchr(buf, ';');
 			if (!ptr)
 				continue;
 			ptr++;

core-signal.c

@@ -262,7 +262,7 @@ static void stress_dump_map_info(uint8_t *fault_addr)
 				char *ptr2;
 
 				/* truncate to first \n found */
-				ptr1 = strchr(buf, (int)'\n');
+				ptr1 = shim_strchr(buf, (int)'\n');
 				if (ptr1)
 					*ptr1 = '\0';
 

stress-af-alg.c

@@ -159,7 +159,7 @@ static void MLOCKED_TEXT stress_af_alg_alarm_handler(int signum)
 static stress_crypto_type_t name_to_type(const char *buffer, const size_t buffer_len)
 {
 	const char *end = buffer + shim_strnlen(buffer, buffer_len);
-	const char *ptr = strchr(buffer, ':');
+	const char *ptr = shim_strchr(buffer, ':');
 	size_t i;
 
 	if (UNLIKELY(!ptr))
@@ -1377,8 +1377,8 @@ static int stress_af_alg(stress_args_t *args)
  */
 static char *dup_field(char *buffer)
 {
-	const char *ptr = strchr(buffer, ':');
-	char *eol = strchr(buffer, '\n');
+	const char *ptr = shim_strchr(buffer, ':');
+	char *eol = shim_strchr(buffer, '\n');
 
 	if (!ptr)
 		return NULL;
@@ -1394,7 +1394,7 @@ static char *dup_field(char *buffer)
  */
 static int CONST int_field(const char *buffer)
 {
-	const char *ptr = strchr(buffer, ':');
+	const char *ptr = shim_strchr(buffer, ':');
 
 	if (!ptr)
 		return -1;
@@ -1408,7 +1408,7 @@ static int CONST int_field(const char *buffer)
  */
 static bool CONST bool_field(const char *buffer)
 {
-	const char *ptr = strchr(buffer, ':');
+	const char *ptr = shim_strchr(buffer, ':');
 
 	if (!ptr)
 		return false;

stress-cgroup.c

@@ -67,7 +67,7 @@ static inline void stress_cgroup_remove_nl(char *str)
 {
 	char *ptr;
 
-	ptr = strchr(str, '\n');
+	ptr = shim_strchr(str, '\n');
 	if (ptr)
 		*ptr = '\0';
 }