| Message ID | 1376090777-20090-15-git-send-email-roy.franz@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, 9 Aug 2013 16:26:15 -0700, Roy Franz <roy.franz@linaro.org> 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 <roy.franz@linaro.org> Okay, but at some point arch/arm/boot/compressed/string.c should be reworked into a common place. Reviewed-by: Grant Likely <grant.likely@linaro.org> > --- > 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/
On Fri, Aug 30, 2013 at 02:43:25PM +0100, Grant Likely wrote: > On Fri, 9 Aug 2013 16:26:15 -0700, Roy Franz <roy.franz@linaro.org> 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 <roy.franz@linaro.org> > > Okay, but at some point arch/arm/boot/compressed/string.c should be > reworked into a common place. Only if the common place can be built with arch specific compile options, like -fpic, without impacting the rest of the kernel.
On Fri, Aug 30, 2013 at 2:47 PM, Russell King - ARM Linux <linux@arm.linux.org.uk> wrote: > On Fri, Aug 30, 2013 at 02:43:25PM +0100, Grant Likely wrote: >> On Fri, 9 Aug 2013 16:26:15 -0700, Roy Franz <roy.franz@linaro.org> 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 <roy.franz@linaro.org> >> >> Okay, but at some point arch/arm/boot/compressed/string.c should be >> reworked into a common place. > > Only if the common place can be built with arch specific compile options, > like -fpic, without impacting the rest of the kernel. agreed. It would be a bit of a science project to see how feasible. g.
On Fri, Aug 30, 2013 at 7:02 AM, Grant Likely <grant.likely@secretlab.ca> wrote: > On Fri, Aug 30, 2013 at 2:47 PM, Russell King - ARM Linux > <linux@arm.linux.org.uk> wrote: >> On Fri, Aug 30, 2013 at 02:43:25PM +0100, Grant Likely wrote: >>> On Fri, 9 Aug 2013 16:26:15 -0700, Roy Franz <roy.franz@linaro.org> 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 <roy.franz@linaro.org> >>> >>> Okay, but at some point arch/arm/boot/compressed/string.c should be >>> reworked into a common place. >> >> Only if the common place can be built with arch specific compile options, >> like -fpic, without impacting the rest of the kernel. > > agreed. It would be a bit of a science project to see how feasible. > > g. The strstr implemtation here is pretty generic, but some architectures like x86 use inline ASM for some of these string functions, so there are some additional complications to unifying this code across architectures. Roy
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)
The shared efi-stub-helper.c functions require a strstr implementation. Implementation copied from arch/x86/boot/string.c Signed-off-by: Roy Franz <roy.franz@linaro.org> --- arch/arm/boot/compressed/string.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)