From patchwork Fri Mar 1 17:15:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 86656 X-Patchwork-Delegate: dj@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B28173858421 for ; Fri, 1 Mar 2024 17:16:12 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by sourceware.org (Postfix) with ESMTPS id 1B4D23858C66 for ; Fri, 1 Mar 2024 17:15:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 1B4D23858C66 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 1B4D23858C66 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::636 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709313335; cv=none; b=D3iwTz0Ugbjlo5TNi5IQq57cgxu+4ki7qWP+8InNz/wjotkJynEItjC+nY7fNIAKmGgZ++OVK4Q9X0bx0TO5P7a1c7feRHqvbEWLWdep5oSjKx9b6TqES9uBLXwrbcpBCXAcn5Yif1D23NdLw/ndZYpRfNbVkQkbi2OTBtdR57M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709313335; c=relaxed/simple; bh=TEm4RgpYhYNb7nKPTBpazbSvCWl2YZ25xMReLIgUAzg=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=AhCwFcvhTYwrXBLgNUZSbf8fmaXutcaR1HV0uzeLXTVxYyJMS6L9PRrHYY+593YXOuxiOdKo2K0pEnJKg6AdPdGKT87Dy2UsCohM7SpblG7weMIx6e4TfV/G+qb5YqS+P8fkFt4pqABagWADUFAOIJzH5oYrOILxd9Pg2wgtYwk= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1dc75972f25so21352805ad.1 for ; Fri, 01 Mar 2024 09:15:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709313331; x=1709918131; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HkwY2rUYnBPDz2C6ecq7ITnM+POyl7wwBsYj/QNqA18=; b=dshoxM6RgVtoL8215tVjVtqUExfarixei4ZnOUAkEPLtG3W4UWHv8pKuEE0R70IjgW kS18VW2f+Du7oWaOlJJjwmurHKnrHmaSsDj9n5169ZE09Z69dyYzisYSen1m/aLzw3hx +iUOZZebK6DUTAbePtjBATYxWR0mzAhWoLf2TCndpz1dLGRhAeemajZJAB60C5gvXemU xvanFmFLMkk8KPmN6UyTUbR1dC/qZ/iiv/mtUWmEUM5MSuhCTM49nV0weHR4Is0IoKRi 9YbZ3FJV7F+t4QvxEaBXu3THdebvl6vt5tPdz5sS4ORsHAZ+aQcKe8omVb6amMPYNpjT 89JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709313331; x=1709918131; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HkwY2rUYnBPDz2C6ecq7ITnM+POyl7wwBsYj/QNqA18=; b=sim3zd9wgCZYbqNDGabp/w4lOo0U9OblGMupaIb5+cI12FZ9u0jGA1wCgDqV40lVeD sJXP7iC4xruIQG0nx7ivYE1haddDrhmYDs5d4dwyfVDp6Lae7SG7Ut+GXJA433E+1GmP CUAX/iSpvnfYZc0SaWJeWXgT4PkxvXtj6YyHgWnQ85QQQ4ZPrnEFDfveK9Lzl4//Yeqa M9EAvecGhazn6ObpRnb+++qkR0REUb5/4LET8KzVEGAPCAvIxhx1Rhqft//wSQGDQOsW jYazVbAyBVKzhZMLrV6BoxAyo53eUUgzjAFL3BXpAeVveyA/iQskLSb0kyhBGGa+rxVo P3HA== X-Gm-Message-State: AOJu0YytXrf5IYLvwo20oSfn9TW3sxIwkH9BTLJyBzuGEi4a0i8tx/q3 WexEmPMKjMFXX0PM1DjEC2zS126dUohM2aOUPjYzmihnFu5uSiK/M4lPSzv+qv2ilqjaOdPch+Z q X-Google-Smtp-Source: AGHT+IHbCWoyMLQs+9ijk+yLP/zWA7RBXiuqqgRJA/pbSiGu7+Gj9AuRbRlsjYC+kKulbOXOy6DtOg== X-Received: by 2002:a17:902:dac5:b0:1dc:78ea:1cf with SMTP id q5-20020a170902dac500b001dc78ea01cfmr2190257plx.58.1709313330781; Fri, 01 Mar 2024 09:15:30 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c1:c57d:9e2a:a00b:9999:1e87]) by smtp.gmail.com with ESMTPSA id h15-20020a170902f54f00b001d974ffa1fcsm3702407plf.173.2024.03.01.09.15.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 09:15:30 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: DJ Delorie Subject: [PATCH v2 1/2] wcsmbs: Add test-wcsstr Date: Fri, 1 Mar 2024 14:15:23 -0300 Message-Id: <20240301171524.3706554-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240301171524.3706554-1-adhemerval.zanella@linaro.org> References: <20240301171524.3706554-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Parametrize test-strstr.c so it can be used to check wcsstr. Checked on x86_64-linux-gnu and aarch64-linux-gnu. --- string/test-strstr.c | 142 +++++++++++++++++++++++++++---------------- wcsmbs/Makefile | 1 + wcsmbs/test-wcsstr.c | 20 ++++++ wcsmbs/wcsstr.c | 8 ++- 4 files changed, 117 insertions(+), 54 deletions(-) create mode 100644 wcsmbs/test-wcsstr.c diff --git a/string/test-strstr.c b/string/test-strstr.c index 4115f7d2fd..e628a3478a 100644 --- a/string/test-strstr.c +++ b/string/test-strstr.c @@ -17,21 +17,56 @@ . */ #define TEST_MAIN -#define TEST_NAME "strstr" -#include "test-string.h" +#ifndef WIDE +# define TEST_NAME "strstr" +# define TEST_FUNC strstr +#else +# define TEST_NAME "wcsstr" +# define TEST_FUNC wcsstr +#endif + +#ifndef WIDE +# define CHAR char +# define STRLEN strlen +# define STRCPY strcpy +# define MEMCPY memcpy +# define MEMSET memset +# define MEMPCPY mempcpy +# define L(s) s +#else +# include +# define CHAR wchar_t +# define STRLEN wcslen +# define STRCPY wcscpy +# define MEMCPY wmemcpy +# define MEMSET wmemset +# define MEMPCPY wmempcpy +# define L(s) L ## s +/* The test requires up to 8191 charateres, so allocate at least 32Kb + (considering 4kb page size). */ +# define BUF1PAGES 4 +#endif +#include "test-string.h" -#define STRSTR c_strstr -#define libc_hidden_builtin_def(arg) /* nothing */ -#define __strnlen strnlen -#include "strstr.c" +#ifndef WIDE +# define STRSTR c_strstr +# define libc_hidden_builtin_def(arg) /* nothing */ +# define __strnlen strnlen +# include "strstr.c" +# define C_IMPL STRSTR +#else +# define WCSSTR c_wcsstr +# include "wcsstr.c" +# define C_IMPL WCSSTR +#endif /* Naive implementation to verify results. */ -static char * -simple_strstr (const char *s1, const char *s2) +static CHAR * +simple_strstr (const CHAR *s1, const CHAR *s2) { - ssize_t s1len = strlen (s1); - ssize_t s2len = strlen (s2); + ssize_t s1len = STRLEN (s1); + ssize_t s2len = STRLEN (s2); if (s2len > s1len) return NULL; @@ -43,29 +78,27 @@ simple_strstr (const char *s1, const char *s2) if (s1[i + j] != s2[j]) break; if (j == s2len) - return (char *) s1 + i; + return (CHAR *) s1 + i; } return NULL; } -typedef char *(*proto_t) (const char *, const char *); - -IMPL (c_strstr, 0) -IMPL (strstr, 1) +typedef CHAR *(*proto_t) (const CHAR *, const CHAR *); +IMPL (C_IMPL, 1) +IMPL (TEST_FUNC, 1) static int -check_result (impl_t *impl, const char *s1, const char *s2, - char *exp_result) +check_result (impl_t *impl, const CHAR *s1, const CHAR *s2, + CHAR *exp_result) { - char *result = CALL (impl, s1, s2); + CHAR *result = CALL (impl, s1, s2); if (result != exp_result) { - error (0, 0, "Wrong result in function %s %s %s", impl->name, - (result == NULL) ? "(null)" : result, - (exp_result == NULL) ? "(null)" : exp_result); + error (0, 0, "Wrong result in function %s %p %p", impl->name, + result, exp_result); ret = 1; return -1; } @@ -74,7 +107,7 @@ check_result (impl_t *impl, const char *s1, const char *s2, } static void -do_one_test (impl_t *impl, const char *s1, const char *s2, char *exp_result) +do_one_test (impl_t *impl, const CHAR *s1, const CHAR *s2, CHAR *exp_result) { if (check_result (impl, s1, s2, exp_result) < 0) return; @@ -85,49 +118,51 @@ static void do_test (size_t align1, size_t align2, size_t len1, size_t len2, int fail) { - char *s1 = (char *) (buf1 + align1); - char *s2 = (char *) (buf2 + align2); + align1 = align1 * sizeof (CHAR); + align2 = align2 * sizeof (CHAR); - static const char d[] = "1234567890abcdef"; -#define dl (sizeof (d) - 1) - char *ss2 = s2; + CHAR *s1 = (CHAR *) (buf1 + align1); + CHAR *s2 = (CHAR *) (buf2 + align2); + + static const CHAR d[] = L("1234567890abcdef"); + const size_t dl = STRLEN (d); + CHAR *ss2 = s2; for (size_t l = len2; l > 0; l = l > dl ? l - dl : 0) { size_t t = l > dl ? dl : l; - ss2 = mempcpy (ss2, d, t); + ss2 = MEMPCPY (ss2, d, t); } s2[len2] = '\0'; if (fail) { - char *ss1 = s1; + CHAR *ss1 = s1; for (size_t l = len1; l > 0; l = l > dl ? l - dl : 0) { size_t t = l > dl ? dl : l; - memcpy (ss1, d, t); + MEMCPY (ss1, d, t); ++ss1[len2 > 7 ? 7 : len2 - 1]; ss1 += t; } } else { - memset (s1, '0', len1); - memcpy (s1 + len1 - len2, s2, len2); + MEMSET (s1, '0', len1); + MEMCPY (s1 + len1 - len2, s2, len2); } s1[len1] = '\0'; FOR_EACH_IMPL (impl, 0) do_one_test (impl, s1, s2, fail ? NULL : s1 + len1 - len2); - } static void check1 (void) { - const char s1[] = - "F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_A7_20_EF_BF_BD"; - const char s2[] = "_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"; - char *exp_result; + const CHAR s1[] = + L("F_BD_CE_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_88_20_EF_BF_BD_EF_BF_BD_EF_BF_BD_C3_A7_20_EF_BF_BD"); + const CHAR s2[] = L("_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD_EF_BF_BD"); + CHAR *exp_result; exp_result = simple_strstr (s1, s2); FOR_EACH_IMPL (impl, 0) @@ -137,30 +172,31 @@ check1 (void) static void check2 (void) { - const char s1_stack[] = ", enable_static, \0, enable_shared, "; - const size_t s1_byte_count = 18; - const char *s2_stack = &(s1_stack[s1_byte_count]); - const size_t s2_byte_count = 18; - char *exp_result; + const CHAR s1_stack[] = L(", enable_static, \0, enable_shared, "); + const size_t s1_char_count = 18; + const size_t s1_byte_len = 18 * sizeof (CHAR); + const CHAR *s2_stack = &(s1_stack[s1_char_count]); + const size_t s2_byte_len = 18 * sizeof (CHAR); + CHAR *exp_result; const size_t page_size_real = getpagesize (); /* Haystack at end of page. The following page is protected. */ - char *s1_page_end = (void *) buf1 + page_size - s1_byte_count; - strcpy (s1_page_end, s1_stack); + CHAR *s1_page_end = (void *) buf1 + page_size - s1_byte_len; + STRCPY (s1_page_end, s1_stack); /* Haystack which crosses a page boundary. Note: page_size is at least 2 * getpagesize. See test_init. */ - char *s1_page_cross = (void *) buf1 + page_size_real - 8; - strcpy (s1_page_cross, s1_stack); + CHAR *s1_page_cross = (void *) buf1 + page_size_real - 8; + STRCPY (s1_page_cross, s1_stack); /* Needle at end of page. The following page is protected. */ - char *s2_page_end = (void *) buf2 + page_size - s2_byte_count; - strcpy (s2_page_end, s2_stack); + CHAR *s2_page_end = (void *) buf2 + page_size - s2_byte_len; + STRCPY (s2_page_end, s2_stack); /* Needle which crosses a page boundary. Note: page_size is at least 2 * getpagesize. See test_init. */ - char *s2_page_cross = (void *) buf2 + page_size_real - 8; - strcpy (s2_page_cross, s2_stack); + CHAR *s2_page_cross = (void *) buf2 + page_size_real - 8; + STRCPY (s2_page_cross, s2_stack); exp_result = simple_strstr (s1_stack, s2_stack); FOR_EACH_IMPL (impl, 0) @@ -184,8 +220,8 @@ check2 (void) static void pr23637 (void) { - char *h = (char*) buf1; - char *n = (char*) buf2; + CHAR *h = (CHAR*) buf1; + CHAR *n = (CHAR*) buf2; for (int i = 0; i < N; i++) { @@ -200,7 +236,7 @@ pr23637 (void) /* Ensure we don't match at the first 'x'. */ h[0] = 'x'; - char *exp_result = simple_strstr (h, n); + CHAR *exp_result = simple_strstr (h, n); FOR_EACH_IMPL (impl, 0) check_result (impl, h, n, exp_result); } diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index f3333c6a4b..1cddd8cc6d 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -163,6 +163,7 @@ tests := \ test-wcspbrk \ test-wcsrchr \ test-wcsspn \ + test-wcsstr \ test-wmemchr \ test-wmemcmp \ test-wmemset \ diff --git a/wcsmbs/test-wcsstr.c b/wcsmbs/test-wcsstr.c new file mode 100644 index 0000000000..23d6517255 --- /dev/null +++ b/wcsmbs/test-wcsstr.c @@ -0,0 +1,20 @@ +/* Test wcsstr function. + Copyright (C) 2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#define WIDE 1 +#include diff --git a/wcsmbs/wcsstr.c b/wcsmbs/wcsstr.c index 78f1cc9ce0..ec5687e8d7 100644 --- a/wcsmbs/wcsstr.c +++ b/wcsmbs/wcsstr.c @@ -28,8 +28,12 @@ #include +#ifndef WCSSTR +# define WCSSTR wcsstr +#endif + wchar_t * -wcsstr (const wchar_t *haystack, const wchar_t *needle) +WCSSTR (const wchar_t *haystack, const wchar_t *needle) { wchar_t b, c; @@ -92,6 +96,8 @@ foundneedle: ret0: return NULL; } +#ifndef WCSSTR /* This alias is for backward compatibility with drafts of the ISO C standard. Unfortunately the Unix(TM) standard requires this name. */ weak_alias (wcsstr, wcswcs) +#endif