Re: [PATCH 01/15] kbuild: add support of custom paths for "auto.conf*" files

[Michal Marek <mmarek@suse.cz>]

On 2014-09-22 23:53, Alexis Berlemont wrote:
> In the scripts/Makefile.build, use KCONFIG_AUTOCONFIG to include a
> custom path for the "auto.conf" file.
> 
> The "*conf" programs were modified so as to work with the environment
> variable KCONFIG_AUTOCONFIG.
> ---
>  scripts/Makefile.build     |  3 ++-
>  scripts/kconfig/confdata.c | 27 ++++++++++++++++++++++++++-
>  scripts/kconfig/lkc.h      |  1 +
>  3 files changed, 29 insertions(+), 2 deletions(-)
> 
> diff --git a/scripts/Makefile.build b/scripts/Makefile.build
> index bf3e677..ef60769 100644
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> @@ -31,7 +31,8 @@ subdir-asflags-y :=
>  subdir-ccflags-y :=
>  
>  # Read auto.conf if it exists, otherwise ignore
> --include include/config/auto.conf
> +kconfig-autoconfig := $(if $(KCONFIG_AUTOCONFIG),$(KCONFIG_AUTOCONFIG),include/config/auto.conf)
> +-include $(kconfig-autoconfig)
>  
>  include scripts/Kbuild.include
>  
> diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
> index f88d90f..d4d8920 100644
> --- a/scripts/kconfig/confdata.c
> +++ b/scripts/kconfig/confdata.c
> @@ -75,6 +75,27 @@ const char *conf_get_autoconfig_name(void)
>  	return name ? name : "include/config/auto.conf";
>  }
>  
> +#define PATH_MAXLENGTH 4096
> +const char *conf_get_autoconfigdep_name(void)
> +{
> +	static char res_value[PATH_MAXLENGTH];
> +
> +	char *name = getenv("KCONFIG_AUTOCONFIG");
> +
> +	if (name == NULL)
> +		name = "include/config/auto.conf.cmd";

This will result in "include/config/auto.conf.cmd.cmd". Better simplify
it to name = conf_get_autoconfig_name().


> +	if (strlen(name) > PATH_MAXLENGTH - 5)
> +		name = NULL;
> +	else {
> +		res_value[0] = 0;

This assignment is superfluous.


> +		strncpy(res_value, name, PATH_MAXLENGTH);
> +		strcat(res_value, ".cmd");
> +		name = res_value;

Michal