[prev in list] [next in list] [prev in thread] [next in thread] 

List:       uclinux-dev
Subject:    Re: [uClinux-dev] [PATCH] ld-elf2flt: fix option order when
From:       David McCullough <David_Mccullough () securecomputing ! com>
Date:       2009-11-09 23:59:47
Message-ID: 20091109235947.GA8127 () mcafee ! com
[Download RAW message or body]


Jivin Mike Frysinger lays it down ...
> Poor getopt() implementations as found in many BSD/Darwin systems will
> stop processing options after a non-option is encountered.  That means
> ld-elf2flt has to be careful to not stick options after non-options when
> executing sub children.  In a default setup, it will invoke `elf2flt` with
> the output followed by the -a option which subsequently fails:
> elf2flt: Can't open '-a': No such file or directory

Applied,  thanks,
Davidm


> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
>  ld-elf2flt.c |   13 ++++++++++---
>  1 files changed, 10 insertions(+), 3 deletions(-)
> 
> diff --git a/ld-elf2flt.c b/ld-elf2flt.c
> index f9b0f1a..227c90b 100644
> --- a/ld-elf2flt.c
> +++ b/ld-elf2flt.c
> @@ -76,7 +76,14 @@ static void append_sed(sed_commands_t *dst, const char *pattern,
>  
>  /* Execute an external program COMMAND.  Write its stdout to OUTPUT,
>     unless that is NULL.  Pass the trailing NULL terminated list of
> -   options, followed by all those in OPTIONS, if that is non-NULL.  */
> +   options, followed by all those in OPTIONS, if that is non-NULL.
> +   Order of options is important here as we may run on systems that
> +   do not allow options after non-options (i.e. many BSDs).  So the
> +   final command line will look like:
> +   <command> [options] [... va args ...]
> +   This is because [options] will (should?) never contain non-options,
> +   while non-options will always be passed via the [va args].
> + */
>  static int
>  execute(const char *command, const char *output, const options_t *options, ...)
>  {
> @@ -92,12 +99,12 @@ execute(const char *command, const char *output, const options_t *options, ...)
>  
>  	init_options(&opts);
>  	append_option(&opts, command);
> +	if (options)
> +		append_options(&opts, options);
>  	va_start(args, options);
>  	while ((opt = va_arg(args, const char *)))
>  		append_option(&opts, opt);
>  	va_end(args);
> -	if (options)
> -		append_options(&opts, options);
>  	append_option(&opts, NULL);
>  
>  	fflush(stdout);
> -- 
> 1.6.5.2
> 
> _______________________________________________
> uClinux-dev mailing list
> uClinux-dev@uclinux.org
> http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
> This message was resent by uclinux-dev@uclinux.org
> To unsubscribe see:
> http://mailman.uclinux.org/mailman/options/uclinux-dev
> 
> 

-- 
David McCullough,  david_mccullough@securecomputing.com,  Ph:+61 734352815
McAfee - SnapGear  http://www.snapgear.com                http://www.uCdot.org
_______________________________________________
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
[prev in list] [next in list] [prev in thread] [next in thread]