Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755945Ab3H3NnW (ORCPT ); Fri, 30 Aug 2013 09:43:22 -0400 Received: from mail-we0-f177.google.com ([74.125.82.177]:48874 "EHLO mail-we0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752797Ab3H3NnU (ORCPT ); Fri, 30 Aug 2013 09:43:20 -0400 From: Grant Likely Subject: Re: [PATCH 14/16] Add strstr to compressed string.c for ARM. To: Roy Franz , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, matt.fleming@intel.com, linux@arm.linux.org.uk Cc: leif.lindholm@linaro.org, dave.martin@arm.com, msalter@redhat.com, Roy Franz In-Reply-To: <1376090777-20090-15-git-send-email-roy.franz@linaro.org> References: <1376090777-20090-1-git-send-email-roy.franz@linaro.org> <1376090777-20090-15-git-send-email-roy.franz@linaro.org> Date: Fri, 30 Aug 2013 14:43:25 +0100 Message-Id: <20130830134325.51DC83E102A@localhost> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1837 Lines: 62 On Fri, 9 Aug 2013 16:26:15 -0700, Roy Franz wrote: > The shared efi-stub-helper.c functions require a strstr > implementation. > Implementation copied from arch/x86/boot/string.c > > Signed-off-by: Roy Franz Okay, but at some point arch/arm/boot/compressed/string.c should be reworked into a common place. Reviewed-by: Grant Likely > --- > arch/arm/boot/compressed/string.c | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/arch/arm/boot/compressed/string.c b/arch/arm/boot/compressed/string.c > index 36e53ef..5397792 100644 > --- a/arch/arm/boot/compressed/string.c > +++ b/arch/arm/boot/compressed/string.c > @@ -111,6 +111,27 @@ char *strchr(const char *s, int c) > return (char *)s; > } > > +/** > + * strstr - Find the first substring in a %NUL terminated string > + * @s1: The string to be searched > + * @s2: The string to search for > + */ > +char *strstr(const char *s1, const char *s2) > +{ > + size_t l1, l2; > + > + l2 = strlen(s2); > + if (!l2) > + return (char *)s1; > + l1 = strlen(s1); > + while (l1 >= l2) { > + l1--; > + if (!memcmp(s1, s2, l2)) > + return (char *)s1; > + s1++; > + } > + return NULL; > +} > #undef memset > > void *memset(void *s, int c, size_t count) > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/