sbase/libutf/utftorunestr.c

/* See LICENSE file for copyright and license details. */
#include "../utf.h"

size_t
utftorunestr(const char *str, Rune *r)
{
	size_t i;
	int n;

	for (i = 0; (n = chartorune(&r[i], str)) && r[i]; i++)
		str += n;

	return i;
}

size_t
utfntorunestr(const char *str, size_t len, Rune *r)
{
	size_t i;
	int n;
	const char *end = str + len;

	for (i = 0; (n = charntorune(&r[i], str, end - str)); i++)
		str += n;

	return i;
}
Scrap chartorunearr(), introducing utftorunestr() Interface and function as proposed by cls. The reasoning behind this function is that cls expressed his interest to keep memory allocation out of libutf, which is a very good motive. This simplifies the function a lot and should also increase the speed a bit, but the most important factor here is that there's no malloc anywhere in libutf, making it a lot smaller and more robust with a smaller attack-surface. Look at the paste(1) and tr(1) changes for an idiomatic way to allocate the right amount of space for the Rune-array. 2015-02-11 20:32:09 +00:00			`/* See LICENSE file for copyright and license details. */`
			`#include "../utf.h"`

libutf: Change return type of utftorunestr to size_t It returns the size of the rune array, so size_t is the right type to use here. 2020-04-07 08:25:22 +00:00			`size_t`
Scrap chartorunearr(), introducing utftorunestr() Interface and function as proposed by cls. The reasoning behind this function is that cls expressed his interest to keep memory allocation out of libutf, which is a very good motive. This simplifies the function a lot and should also increase the speed a bit, but the most important factor here is that there's no malloc anywhere in libutf, making it a lot smaller and more robust with a smaller attack-surface. Look at the paste(1) and tr(1) changes for an idiomatic way to allocate the right amount of space for the Rune-array. 2015-02-11 20:32:09 +00:00			`utftorunestr(const char str, Rune r)`
			`{`
paste: Support -d '\0' POSIX specifies that -d '\0' sets the delimiter to an empty string. 2020-04-15 16:46:39 +00:00			`size_t i;`
			`int n;`
Scrap chartorunearr(), introducing utftorunestr() Interface and function as proposed by cls. The reasoning behind this function is that cls expressed his interest to keep memory allocation out of libutf, which is a very good motive. This simplifies the function a lot and should also increase the speed a bit, but the most important factor here is that there's no malloc anywhere in libutf, making it a lot smaller and more robust with a smaller attack-surface. Look at the paste(1) and tr(1) changes for an idiomatic way to allocate the right amount of space for the Rune-array. 2015-02-11 20:32:09 +00:00
libutf: Change return type of utftorunestr to size_t It returns the size of the rune array, so size_t is the right type to use here. 2020-04-07 08:25:22 +00:00			`for (i = 0; (n = chartorune(&r[i], str)) && r[i]; i++)`
Scrap chartorunearr(), introducing utftorunestr() Interface and function as proposed by cls. The reasoning behind this function is that cls expressed his interest to keep memory allocation out of libutf, which is a very good motive. This simplifies the function a lot and should also increase the speed a bit, but the most important factor here is that there's no malloc anywhere in libutf, making it a lot smaller and more robust with a smaller attack-surface. Look at the paste(1) and tr(1) changes for an idiomatic way to allocate the right amount of space for the Rune-array. 2015-02-11 20:32:09 +00:00			`str += n;`

			`return i;`
			`}`
paste: Support -d '\0' POSIX specifies that -d '\0' sets the delimiter to an empty string. 2020-04-15 16:46:39 +00:00
			`size_t`
			`utfntorunestr(const char str, size_t len, Rune r)`
			`{`
			`size_t i;`
			`int n;`
			`const char *end = str + len;`

			`for (i = 0; (n = charntorune(&r[i], str, end - str)); i++)`
			`str += n;`

			`return i;`
			`}`