Commit c91eb033 authored by Willy Tarreau's avatar Willy Tarreau Committed by Paul E. McKenney
Browse files

tools/nolibc/string: split the string functions into string.h 



The string manipulation functions (mem*, str*) are now found in
string.h. The file depends on almost nothing and will be
usable from other includes if needed. Maybe more functions could
be added.

Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 06fdba53

tools/include/nolibc/nolibc.h

+1 −95
Original line number Diff line number Diff line
@@ -88,99 +88,11 @@ 
#include "types.h"

#include "sys.h"

#include "stdlib.h"

#include "string.h"



/* Used by programs to avoid std includes */

#define NOLIBC



/* some size-optimized reimplementations of a few common str* and mem*

 * functions. They're marked static, except memcpy() and raise() which are used

 * by libgcc on ARM, so they are marked weak instead in order not to cause an

 * error when building a program made of multiple files (not recommended).

 */



static __attribute__((unused))

void *memmove(void *dst, const void *src, size_t len)

{

	ssize_t pos = (dst <= src) ? -1 : (long)len;

	void *ret = dst;



	while (len--) {

		pos += (dst <= src) ? 1 : -1;

		((char *)dst)[pos] = ((char *)src)[pos];

	}

	return ret;

}



static __attribute__((unused))

void *memset(void *dst, int b, size_t len)

{

	char *p = dst;



	while (len--)

		*(p++) = b;

	return dst;

}



static __attribute__((unused))

int memcmp(const void *s1, const void *s2, size_t n)

{

	size_t ofs = 0;

	char c1 = 0;



	while (ofs < n && !(c1 = ((char *)s1)[ofs] - ((char *)s2)[ofs])) {

		ofs++;

	}

	return c1;

}



static __attribute__((unused))

char *strcpy(char *dst, const char *src)

{

	char *ret = dst;



	while ((*dst++ = *src++));

	return ret;

}



static __attribute__((unused))

char *strchr(const char *s, int c)

{

	while (*s) {

		if (*s == (char)c)

			return (char *)s;

		s++;

	}

	return NULL;

}



static __attribute__((unused))

char *strrchr(const char *s, int c)

{

	const char *ret = NULL;



	while (*s) {

		if (*s == (char)c)

			ret = s;

		s++;

	}

	return (char *)ret;

}



static __attribute__((unused))

size_t nolibc_strlen(const char *str)

{

	size_t len;



	for (len = 0; str[len]; len++);

	return len;

}



#define strlen(str) ({                          \

	__builtin_constant_p((str)) ?           \

		__builtin_strlen((str)) :       \

		nolibc_strlen((str));           \

})



static __attribute__((unused))

int isdigit(int c)

{
@@ -209,12 +121,6 @@ const char *ltoa(long in) 
	return pos + 1;

}



__attribute__((weak,unused))

void *memcpy(void *dst, const void *src, size_t len)

{

	return memmove(dst, src, len);

}



/* Here come a few helper functions */



static __attribute__((unused))

tools/include/nolibc/string.h

0 → 100644
+107 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: LGPL-2.1 OR MIT */

/*

 * string function definitions for NOLIBC

 * Copyright (C) 2017-2021 Willy Tarreau <w@1wt.eu>

 */



#ifndef _NOLIBC_STRING_H

#define _NOLIBC_STRING_H



#include "std.h"



/*

 * As much as possible, please keep functions alphabetically sorted.

 */



static __attribute__((unused))

int memcmp(const void *s1, const void *s2, size_t n)

{

	size_t ofs = 0;

	char c1 = 0;



	while (ofs < n && !(c1 = ((char *)s1)[ofs] - ((char *)s2)[ofs])) {

		ofs++;

	}

	return c1;

}



static __attribute__((unused))

void *memmove(void *dst, const void *src, size_t len)

{

	ssize_t pos = (dst <= src) ? -1 : (long)len;

	void *ret = dst;



	while (len--) {

		pos += (dst <= src) ? 1 : -1;

		((char *)dst)[pos] = ((char *)src)[pos];

	}

	return ret;

}



/* must be exported, as it's used by libgcc on ARM */

__attribute__((weak,unused))

void *memcpy(void *dst, const void *src, size_t len)

{

	return memmove(dst, src, len);

}



static __attribute__((unused))

void *memset(void *dst, int b, size_t len)

{

	char *p = dst;



	while (len--)

		*(p++) = b;

	return dst;

}



static __attribute__((unused))

char *strchr(const char *s, int c)

{

	while (*s) {

		if (*s == (char)c)

			return (char *)s;

		s++;

	}

	return NULL;

}



static __attribute__((unused))

char *strcpy(char *dst, const char *src)

{

	char *ret = dst;



	while ((*dst++ = *src++));

	return ret;

}



/* this function is only used with arguments that are not constants */

static __attribute__((unused))

size_t nolibc_strlen(const char *str)

{

	size_t len;



	for (len = 0; str[len]; len++);

	return len;

}



#define strlen(str) ({                          \

	__builtin_constant_p((str)) ?           \

		__builtin_strlen((str)) :       \

		nolibc_strlen((str));           \

})



static __attribute__((unused))

char *strrchr(const char *s, int c)

{

	const char *ret = NULL;



	while (*s) {

		if (*s == (char)c)

			ret = s;

		s++;

	}

	return (char *)ret;

}



#endif /* _NOLIBC_STRING_H */