New upstream version 4.17.0~rc1

lib/string/strchr/stpspn.c

@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strchr/stpspn.h"

lib/string/strchr/stpspn.h

@@ -0,0 +1,26 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRCHR_STPSPN_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRCHR_STPSPN_H_
+
+
+#include <config.h>
+
+#include <string.h>
+
+#include "attr.h"
+
+
+// Similar to strspn(3), but return a pointer instead of an offset.
+// Similar to strchrnul(3), but search for any bytes not in 'accept'.
+#define stpspn(s, accept)                                                     \
+({                                                                            \
+	__auto_type  s_ = s;                                                  \
+                                                                              \
+	s_ + strspn(s_, accept);                                              \
+})
+
+
+#endif  // include guard

lib/string/strchr/strchrcnt.c

@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strchr/strchrcnt.h"
+
+#include <stddef.h>
+
+
+extern inline size_t strchrcnt(const char *s, char c);

lib/string/strchr/strchrcnt.h

@@ -0,0 +1,35 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRCHR_STRCHRCNT_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRCHR_STRCHRCNT_H_
+
+
+#include <config.h>
+
+#include <stddef.h>
+
+#include "attr.h"
+#include "string/strcmp/streq.h"
+
+
+ATTR_STRING(1)
+inline size_t strchrcnt(const char *s, char c);
+
+
+inline size_t
+strchrcnt(const char *s, char c)
+{
+	size_t  n = 0;
+
+	for (; !streq(s, ""); s++) {
+		if (*s == c)
+			n++;
+	}
+
+	return n;
+}
+
+
+#endif  // include guard

lib/string/strchr/strnul.c

@@ -0,0 +1,7 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strchr/strnul.h"

lib/string/strchr/strnul.h

@@ -0,0 +1,25 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRCHR_STRNUL_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRCHR_STRNUL_H_
+
+
+#include <config.h>
+
+#include <string.h>
+
+#include "attr.h"
+
+
+// Similar to strlen(3), but return a pointer instead of an offset.
+#define strnul(s)                                                             \
+({                                                                            \
+	__auto_type  s_ = s;                                                  \
+                                                                              \
+	s_ + strlen(s_);                                                      \
+})
+
+
+#endif  // include guard

lib/string/strchr/strrspn.c

@@ -0,0 +1,10 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#include <config.h>
+
+#include "string/strchr/strrspn.h"
+
+
+extern inline char *strrspn(char *restrict s, const char *restrict accept);

lib/string/strchr/strrspn.h

@@ -0,0 +1,38 @@
+// SPDX-FileCopyrightText: 2024, Alejandro Colomar <alx@kernel.org>
+// SPDX-License-Identifier: BSD-3-Clause
+
+
+#ifndef SHADOW_INCLUDE_LIB_STRING_STRCHR_STRRSPN_H_
+#define SHADOW_INCLUDE_LIB_STRING_STRCHR_STRRSPN_H_
+
+
+#include <config.h>
+
+#include <string.h>
+
+#include "attr.h"
+#include "string/strchr/strnul.h"
+
+
+ATTR_STRING(2)
+inline char *strrspn(char *restrict s, const char *restrict accept);
+
+
+// Available in Oracle Solaris: strrspn(3GEN).
+// <https://docs.oracle.com/cd/E36784_01/html/E36877/strrspn-3gen.html>
+inline char *
+strrspn(char *restrict s, const char *restrict accept)
+{
+	char  *p;
+
+	p = strnul(s);
+	while (p > s) {
+		p--;
+		if (strchr(accept, *p) == NULL)
+			return p + 1;
+	}
+	return s;
+}
+
+
+#endif  // include guard