Re: [PATCH] scripts/nsdeps: escape '/' for module source files

[Jessica Yu]

+++ David Laight [21/10/19 16:14 +0000]:
> From Jessica Yu
> > Sent: 21 October 2019 15:52
> > When doing an out of tree build with O=, the nsdeps script constructs
> > the absolute pathname of the module source file so that it can insert
> > MODULE_IMPORT_NS statements in the right place. However, ${srctree}
> > contains an unescaped path to the source tree, which, when used in a sed
> > substitution, makes sed complain:
> >
> > ++ sed 's/[^ ]* *//home/jeyu/jeyu-linux\/&/g'
> > sed: -e expression #1, char 12: unknown option to `s'
> >
> > The sed substitution command 's' ends prematurely with the forward
> > slashes in the pathname, and sed errors out when it encounters the 'h',
> > which is an invalid sed substitution option. So use bash in-variable
> > substitution to escape all forward slashes for sed.
> >
> > Signed-off-by: Jessica Yu <jeyu@xxxxxxxxxx>
> > ---
> >  scripts/nsdeps | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/scripts/nsdeps b/scripts/nsdeps
> > index 3754dac13b31..79f96e596a0b 100644
> > --- a/scripts/nsdeps
> > +++ b/scripts/nsdeps
> > @@ -33,7 +33,7 @@ generate_deps() {
> >  	if [ ! -f "$ns_deps_file" ]; then return; fi
> >  	local mod_source_files=`cat $mod_file | sed -n 1p                      \
> >  					      | sed -e 's/\.o/\.c/g'           \
> > -					      | sed "s/[^ ]* */${srctree}\/&/g"`
> > +					      | sed "s/[^ ]* */${srctree//\//\\\/}\/&/g"`
>
> Rather than adding a bashism - which might bight back later, just change the
> command to use (say) ; instead of / as the separator.
> I think that makes it:
> 	sed "s;[^ ]* *;${srctree}/&;g
>
> 	David

Thanks David! Matthias suggested this as well and so I've sent a v3.