From 00893e79fc62966067af1a106567db96bd170338 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 3 Mar 2024 19:11:32 +0100 Subject: New upstream version 1.2 --- lib/unistr/u8-strstr.c | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) (limited to 'lib/unistr/u8-strstr.c') diff --git a/lib/unistr/u8-strstr.c b/lib/unistr/u8-strstr.c index 8b34c0a9..df2dc964 100644 --- a/lib/unistr/u8-strstr.c +++ b/lib/unistr/u8-strstr.c @@ -1,5 +1,5 @@ /* Substring test for UTF-8 strings. - Copyright (C) 1999, 2002, 2006, 2010-2022 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2010-2024 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This file is free software. @@ -30,11 +30,26 @@ #include -/* FIXME: Maybe walking the string via u8_mblen is a win? */ - -#define FUNC u8_strstr -#define UNIT uint8_t -#define U_STRCHR u8_strchr -#define U_STRMBTOUC u8_strmbtouc -#define UNIT_IS_UINT8_T 1 -#include "u-strstr.h" +uint8_t * +u8_strstr (const uint8_t *haystack, const uint8_t *needle) +{ + uint8_t first = needle[0]; + + /* Is needle empty? */ + if (first == 0) + return (uint8_t *) haystack; + + /* Is needle nearly empty (only one unit)? */ + if (needle[1] == 0) + return u8_strchr (haystack, first); + + /* Is needle nearly empty (only one character)? */ + { + ucs4_t first_uc; + int count = u8_strmbtouc (&first_uc, needle); + if (count > 0 && needle[count] == 0) + return u8_strchr (haystack, first_uc); + } + + return (uint8_t *) strstr ((const char *) haystack, (const char *) needle); +} -- cgit v1.2.3