public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Nicolas Schier <nicolas@fjasle.eu>
To: Randy Dunlap <rdunlap@infradead.org>
Cc: linux-kernel@vger.kernel.org,
	Masahiro Yamada <masahiroy@kernel.org>,
	Nick Desaulniers <ndesaulniers@google.com>,
	linux-kbuild@vger.kernel.org, Andi Kleen <ak@linux.intel.com>
Subject: Re: [PATCH] scripts/config: allow "O=config-dir" option
Date: Tue, 2 Nov 2021 16:38:09 +0100	[thread overview]
Message-ID: <YYFbYac/iU21vYiu@fjasle.eu> (raw)
In-Reply-To: <20211031063322.20486-1-rdunlap@infradead.org>

On Sat, Oct 30, 2021 at 11:33:22PM -0700, Randy Dunlap wrote:
> Support "O=config-dir" as the location of the .config file
> like (some) other kernel build (make) tools do.
> 
> Someone asked for this "feature" a few months ago but I don't
> recall who it was.
> 
> Also check for the existence of the config-dir/config-file
> and report if there is no such file instead of letting grep
> report that there is no such file.
> 
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Masahiro Yamada <masahiroy@kernel.org>
> Cc: Nick Desaulniers <ndesaulniers@google.com>
> Cc: linux-kbuild@vger.kernel.org
> Cc: Andi Kleen <ak@linux.intel.com>
> ---
>  scripts/config |   44 +++++++++++++++++++++++++++++++++++++++-----
>  1 file changed, 39 insertions(+), 5 deletions(-)
> 
> --- linux-next-20211029.orig/scripts/config
> +++ linux-next-20211029/scripts/config
> @@ -37,6 +37,7 @@ commands:
>  
>  options:
>  	--file config-file   .config file to change (default .config)
> +	O=config-dir         Specify the directory location of the config-file
>  	--keep-case|-k       Keep next symbols' case (dont' upper-case it)
>  
>  $myname doesn't check the validity of the .config file. This is done at next
> @@ -124,15 +125,48 @@ undef_var() {
>  	txt_delete "^# $name is not set" "$FN"
>  }
>  
> -if [ "$1" = "--file" ]; then
> -	FN="$2"
> -	if [ "$FN" = "" ] ; then
> +DIR=
> +FN=
> +
> +while [ "$DIR" = "" -o "$FN" = "" ]; do

shellcheck recommends to use [ .. ] || [ .. ] instead of [ .. -o .. ].

> +
> +	if [ "$1" = "" ] ; then
>  		usage
>  	fi
> -	shift 2
> -else
> +	if [ "$1" = "--file" ]; then
> +		FN="$2"
> +		if [ "$FN" = "" ] ; then
> +			usage
> +		fi
> +		shift 2
> +		continue
> +	fi
> +
> +	optn=$1
> +	optnlen=${#optn}
> +	if [ $optnlen -gt 1 ] && [ ${optn:0:2} = "O=" ]; then
> +		DIR=${optn:2}
> +		shift
> +		if [ "$DIR" = "" ]; then
> +			usage
> +		fi
> +		continue
> +	fi
> +	break	# something other than --file or O=dir
> +done
> +
> +if [ "$FN" = "" ]; then
>  	FN=.config
>  fi
> +if [ "$DIR" != "" ]; then
> +	DIR=$DIR"/"
> +fi
> +FN="$DIR""$FN"

A bike shed colour thing: I'd prefer quotes around the complete right
hand side, e.g. "${DIR}/${FN}".

> +
> +if [ ! -r $FN ]; then
             ^^^
$FN needs quotes, otherwise it may lead to syntax errors, e.g. if FN
contains spaces or other syntactical things.

I do like that feature!

With quotes round $FN:
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>

> +	echo "No such config file: $FN"
> +	exit
> +fi
>  
>  if [ "$1" = "" ] ; then
>  	usage

  reply	other threads:[~2021-11-02 15:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-31  6:33 [PATCH] scripts/config: allow "O=config-dir" option Randy Dunlap
2021-11-02 15:38 ` Nicolas Schier [this message]
2021-11-02 22:38   ` Randy Dunlap

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=YYFbYac/iU21vYiu@fjasle.eu \
    --to=nicolas@fjasle.eu \
    --cc=ak@linux.intel.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=masahiroy@kernel.org \
    --cc=ndesaulniers@google.com \
    --cc=rdunlap@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox