Re: [PATCH 23/43] tools lib: Adopt skip_spaces() from the kernel sources

[Arnaldo Carvalho de Melo]

Em Tue, Jul 02, 2019 at 10:46:03AM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Tue, Jul 02, 2019 at 02:12:40PM +0200, Jiri Olsa escreveu:
> > On Mon, Jul 01, 2019 at 11:25:56PM -0300, Arnaldo Carvalho de Melo wrote:
> > > From: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> > > 
> > > Same implementation, will be used to replace ad-hoc equivalent code in
> > > tools/.
> > > 
> > > Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> > > Cc: André Goddard Rosa <andre.goddard@xxxxxxxxx>
> > > Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
> > > Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
> > > Link: https://lkml.kernel.org/n/tip-dig691cg9ripvoiprpidthw7@xxxxxxxxxxxxxx
> > > Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
> > > ---
> > >  tools/include/linux/string.h |  4 +++-
> > >  tools/lib/string.c           | 14 ++++++++++++++
> > >  2 files changed, 17 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/tools/include/linux/string.h b/tools/include/linux/string.h
> > > index 6c3e2cc274c5..cee239350a6b 100644
> > > --- a/tools/include/linux/string.h
> > > +++ b/tools/include/linux/string.h
> > > @@ -29,4 +29,6 @@ static inline bool strstarts(const char *str, const char *prefix)
> > >  	return strncmp(str, prefix, strlen(prefix)) == 0;
> > >  }
> > >  
> > > -#endif /* _LINUX_STRING_H_ */
> > > +extern char * __must_check skip_spaces(const char *);
> > > +
> > > +#endif /* _TOOLS_LINUX_STRING_H_ */
> > > diff --git a/tools/lib/string.c b/tools/lib/string.c
> > > index 93b3d4b6feac..50d400822bb3 100644
> > > --- a/tools/lib/string.c
> > > +++ b/tools/lib/string.c
> > > @@ -17,6 +17,7 @@
> > >  #include <string.h>
> > >  #include <errno.h>
> > >  #include <linux/string.h>
> > > +#include <linux/ctype.h>
> > >  #include <linux/compiler.h>
> > >  
> > >  /**
> > > @@ -106,3 +107,16 @@ size_t __weak strlcpy(char *dest, const char *src, size_t size)
> > >  	}
> > >  	return ret;
> > >  }
> > > +
> > > +/**
> > > + * skip_spaces - Removes leading whitespace from @str.
> > > + * @str: The string to be stripped.
> > > + *
> > > + * Returns a pointer to the first non-whitespace character in @str.
> > > + */
> > > +char *skip_spaces(const char *str)
> > > +{
> > > +	while (isspace(*str))
> > > +		++str;
> > > +	return (char *)str;
> > > +}
> > > -- 
> > > 2.20.1
> > > 
> > 
> > this breaks objtool build, because it adds _ctype dependency via isspace call
> > patch below fixes it for me
> 
> Thanks for  spotting this, I'll have it in my next pull request.

I'm adding a Signed-off-by: you, ok?

- Arnaldo
 
> - Arnaldo
>  
> > jirka
> > 
> > 
> > ---
> > diff --git a/tools/objtool/Build b/tools/objtool/Build
> > index 749becdf5b90..8dc4f0848362 100644
> > --- a/tools/objtool/Build
> > +++ b/tools/objtool/Build
> > @@ -9,6 +9,7 @@ objtool-y += special.o
> >  objtool-y += objtool.o
> >  
> >  objtool-y += libstring.o
> > +objtool-y += libctype.o
> >  objtool-y += str_error_r.o
> >  
> >  CFLAGS += -I$(srctree)/tools/lib
> > @@ -17,6 +18,10 @@ $(OUTPUT)libstring.o: ../lib/string.c FORCE
> >  	$(call rule_mkdir)
> >  	$(call if_changed_dep,cc_o_c)
> >  
> > +$(OUTPUT)libctype.o: ../lib/ctype.c FORCE
> > +	$(call rule_mkdir)
> > +	$(call if_changed_dep,cc_o_c)
> > +
> >  $(OUTPUT)str_error_r.o: ../lib/str_error_r.c FORCE
> >  	$(call rule_mkdir)
> >  	$(call if_changed_dep,cc_o_c)
> 
> -- 
> 
> - Arnaldo

-- 

- Arnaldo