1961aea30

Denys Vlasenko

2013-02-26

SUCCESS Duration: 180s

Subject

move endofname() to libbb

No binary (build failed)

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

(log yok)

include/libbb.h+1 -0

@@ -386,6 +386,7 @@ char bb_get_last_path_component_nostrip(const char path) FAST_FUNC;
	const char bb_basename(const char name) FAST_FUNC;
	/* NB: can violate const-ness (similarly to strchr) */
	char last_char_is(const char s, int c) FAST_FUNC;
+	const char* endofname(const char *name) FAST_FUNC;

	void ndelay_on(int fd) FAST_FUNC;
	void ndelay_off(int fd) FAST_FUNC;

libbb/endofname.c+26 -0

@@ -0,0 +1,26 @@
+	/*
+	* Utility routines.
+	*
+	* Copyright (C) 2013 Denys Vlasenko
+	*
+	* Licensed under GPLv2, see file LICENSE in this source tree.
+	*/
+
+	//kbuild:lib-y += endofname.o
+
+	#include "libbb.h"
+
+	#define is_name(c) ((c) == '_' \|\| isalpha((unsigned char)(c)))
+	#define is_in_name(c) ((c) == '_' \|\| isalnum((unsigned char)(c)))
+
+	const char* FAST_FUNC
+	endofname(const char *name)
+	{
+	if (!is_name(*name))
+	return name;
+	while (*++name) {
+	if (!is_in_name(*name))
+	break;
+	}
+	return name;
+	}

shell/ash.c+3 -21

@@ -385,6 +385,9 @@ static void trace_vprintf(const char *fmt, va_list va);
	/* ============ Utility functions */
	#define xbarrier() do { __asm__ __volatile__ ("": : :"memory"); } while (0)

+	#define is_name(c) ((c) == '_' \|\| isalpha((unsigned char)(c)))
+	#define is_in_name(c) ((c) == '_' \|\| isalnum((unsigned char)(c)))
+
	static int isdigit_str9(const char *str)
	{
	int maxlen = 9 + 1; /* max 9 digits: 999999999 */
@@ -2008,27 +2011,6 @@ getoptsreset(const char *value)
	}
	#endif

-	/* math.h has these, otherwise define our private copies */
-	#if !ENABLE_SH_MATH_SUPPORT
-	#define is_name(c) ((c) == '_' \|\| isalpha((unsigned char)(c)))
-	#define is_in_name(c) ((c) == '_' \|\| isalnum((unsigned char)(c)))
-	/*
-	* Return the pointer to the first char which is not part of a legal variable name
-	* (a letter or underscore followed by letters, underscores, and digits).
-	*/
-	static const char*
-	endofname(const char *name)
-	{
-	if (!is_name(*name))
-	return name;
-	while (*++name) {
-	if (!is_in_name(*name))
-	break;
-	}
-	return name;
-	}
-	#endif
-
	/*
	* Compares two strings up to the first = or '\0'. The first
	* string must be terminated by '='; the second may be terminated by

shell/math.c+0 -12

@@ -494,18 +494,6 @@ static const char op_tokens[] ALIGN1 = {
	};
	#define ptr_to_rparen (&op_tokens[sizeof(op_tokens)-7])

-	const char* FAST_FUNC
-	endofname(const char *name)
-	{
-	if (!is_name(*name))
-	return name;
-	while (*++name) {
-	if (!is_in_name(*name))
-	break;
-	}
-	return name;
-	}
-
	static arith_t FAST_FUNC
	evaluate_string(arith_state_t math_state, const char expr)
	{

shell/math.h+0 -5

@@ -73,11 +73,6 @@ typedef long arith_t;
	#define strto_arith_t strtoul
	#endif

-	/* ash's and hush's endofname is the same, so... */
-	# define is_name(c) ((c) == '_' \|\| isalpha((unsigned char)(c)))
-	# define is_in_name(c) ((c) == '_' \|\| isalnum((unsigned char)(c)))
-	const char* FAST_FUNC endofname(const char *name);
-
	typedef const char* FAST_FUNC (arith_var_lookup_t)(const char name);
	typedef void FAST_FUNC (arith_var_set_t)(const char name, const char *val);
	//typedef const char* FAST_FUNC (arith_var_endofname_t)(const char name);