From patchwork Sat Oct 14 08:56:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Tirta Halim X-Patchwork-Id: 77774 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 A6D95385CCB8 for ; Sat, 14 Oct 2023 08:59:55 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id 0DC983858C2B for ; Sat, 14 Oct 2023 08:59:41 +0000 (GMT) ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0DC983858C2B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::435 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697273982; cv=none; b=GHoPyTlymnZvP1VbU1J6WCX4GHjBwL9gXwLTsAJCRo9wWOKbN7nPHOxhpyd0U7qUW1NPKyiR6b78aqkdNciqNn5RmhSWBYuqsJJyz5b+8y3En2VoNHxXiU52CEweCg3irFLM2IniqMB2MUOuD5NLd3714W5JwGdTkOMIc8201BI= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1697273982; c=relaxed/simple; bh=QFt2FEuANc9pvxnudJUPxo7h7Y1r5+cXDKWcE9AGGFE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=olAPuZx7EhwXMEOP+abmjzq1AZuZlB7GWKa/V/nI4+OQnMAO0weHQtWXTFjwR/rVBWjAlsbqH15wYv1Qcs002Blp0ahLn4o8zwoAB7z6OiME2L5MYrs8wiHFUNIEo9/zxKth5KaFjh1qqScvhUTXQiaaUxLDFHXN9fcmruHmSMY= ARC-Authentication-Results: i=1; server2.sourceware.org DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0DC983858C2B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-6b201a93c9cso1215718b3a.0 for ; Sat, 14 Oct 2023 01:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697273980; x=1697878780; 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=5L+KYERTBr8Pb4Yh4OP2ZPxdAa1gfkd8X2U+CDHmldQ=; b=MyEf6241lhnBkw/5Z6OxJR0iPH+yrcrfW1itct7sPmgRNbWLwsY/XmjgcS6c9M6F03 hkOgBpWFraTX20doMFymyljSm/+Bs8rfXhXM3EJ3WlGqOp/i6j1O6zxXlyaYIxscrb/S CVdA5kIvshOLLZWxOhRaJB4ZSYDQlinabvsL9AtEMt9oP+FyGyCJdxOsopvFMiOIRgIu /q1tklYfVXuq5lKF/xM/aeeLf/UODDxe3wWp2yqiVhVEqfApXwsRk4dtXIQdh0KERZL7 QPWBF2xEbv4RckV4uzpojoomeEAtKn3AW9C67o2h10dkboCVXikNk+rJrGNIWoL1Aud3 unVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697273980; x=1697878780; 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=5L+KYERTBr8Pb4Yh4OP2ZPxdAa1gfkd8X2U+CDHmldQ=; b=gUA4UOnxqc6x+LflXdFu1+FqFMPZGdO0amsKAC5JsU37xOB6/+QgkyAl9HDsadDtux dAi7oUexAS3zDc8l174hOo42HHeX2ui0eHlgd9FpMlG+1CVD77h1eJm1rhHKZI7fX0E7 NeyBf19kefBFy+o80RaYT3nCz6kug9IN2t4sKHm5exlYxpXZr+rFV6n+KKCE8tcrx45o rYQKbtr1TuJwtYbC11H3K+TSFPb20XqSeHYqnQkgAU4xIs1RMKlOE4h4UYw0YJxHZiAe Xyx5lIvEcV4RohnwzDvDjDB7jp5fzIj+wojWt7/okeZKnu9Jj4ycjXxxM8yNe/VCkU1w Yb/w== X-Gm-Message-State: AOJu0Ywj4oC9+iwvGPwpGhaKvpp7/dG5v0tZKKwvMUWcixQf20uLZLAE OoTx+6OIETWdltMBf05VUKY= X-Google-Smtp-Source: AGHT+IFCLxfYbNNztNf0aA16lQfDcAKEO77YOJrOIIv2udi1abPCNmEI0FxSXgcddiC+JJnUc4PN6Q== X-Received: by 2002:a05:6a00:9a0:b0:6b8:780:94e5 with SMTP id u32-20020a056a0009a000b006b8078094e5mr2000436pfg.18.1697273979740; Sat, 14 Oct 2023 01:59:39 -0700 (PDT) Received: from localhost.localdomain ([2001:448a:20a0:422b:fa4f:515b:1eb7:6778]) by smtp.gmail.com with ESMTPSA id y28-20020a056a001c9c00b00690d1269691sm5804472pfw.22.2023.10.14.01.59.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Oct 2023 01:59:39 -0700 (PDT) From: James Tirta Halim To: wilco.dijkstra@arm.com Cc: libc-alpha@sourceware.org, tirtajames45@gmail.com Subject: [PATCH 1/2] strcasestr: check if ne[0] is in hs with strchr or strpbrk as does strstr Date: Sat, 14 Oct 2023 15:56:42 +0700 Message-ID: <20231014085642.153858-1-tirtajames45@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP 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 --- string/strcasestr.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/string/strcasestr.c b/string/strcasestr.c index 2f6b4f8641..aca41211dd 100644 --- a/string/strcasestr.c +++ b/string/strcasestr.c @@ -55,6 +55,30 @@ #endif +static inline char *__attribute__ ((always_inline)) +strcasechr (const char *s, char c) +{ + if (isalpha(c)) { + /* May have optimized strcspn? */ +#if defined __sparc__ || defined __sparc || defined __x86_64__ || defined _M_X64 || defined __s390x__ || defined i386 || defined __i386__ || defined __i386 || defined _M_IX86 || defined __PPC64__ || defined __ppc64__ || defined _ARCH_PPC64 || defined _ARCH_PWR8 + const char a[] = {tolower(c), toupper(c), '\0'}; + s = (char *)strcspn(s, a); +#else + c = tolower(c); + while (*s && tolower(*s) != c) + ++s; +#endif + if (*s != '\0') + return (char *)s; + } else { + s = strchr(s, c); + if (s != NULL) + return (char *)s; + } + return NULL; +} + + /* Find the first occurrence of NEEDLE in HAYSTACK, using case-insensitive comparison. This function gives unspecified results in multibyte locales. */ @@ -68,6 +92,10 @@ STRCASESTR (const char *haystack, const char *needle) if (needle[0] == '\0') return (char *) haystack; + haystack = strcasechr (haystack, *needle); + if (haystack == NULL || needle[1] == '\0') + return (char *) haystack; + /* Ensure HAYSTACK length is at least as long as NEEDLE length. Since a match may occur early on in a huge HAYSTACK, use strnlen and read ahead a few cachelines for improved performance. */ @@ -75,6 +103,9 @@ STRCASESTR (const char *haystack, const char *needle) - haystack_len = __strnlen (haystack, needle_len + 256); + haystack_len = __strnlen (haystack, needle_len); if (haystack_len < needle_len) return NULL; + + if (strncasecmp (haystack, needle, needle_len) == 0) + return (char *) haystack; + haystack_len += __strnlen(haystack + haystack_len, 256); /* Perform the search. Abstract memory is considered to be an array of 'unsigned char' values, not an array of 'char' values. See