On Tue, 23 Nov 2010 17:41:36 -0500 Mike Frysinger wrote:
> If unifdef fails for any reason (like segfaulting), we should be aborting
> the install steps. So check its exit status in this unlikely scenario.
>
> Reported-by: Diego Elio Pettenò <flameeyes@xxxxxxxxxx>
> Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
> ---
> v2
> - apparently exit status of 1 is normal for unifdef, so need to
> handle that too
>
> scripts/headers_install.pl | 7 +++++++
> 1 files changed, 7 insertions(+), 0 deletions(-)
>
> diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
> index 4ca3be3..59ad768 100644
> --- a/scripts/headers_install.pl
> +++ b/scripts/headers_install.pl
> @@ -45,6 +45,13 @@ foreach my $file (@files) {
> close $in;
>
> system $unifdef . " $tmpfile > $installdir/$file";
> + # unifdef will exit 0 on success, and will exit 1 when the
> + # file was processed successfully but no changes were made,
> + # so abort only when it's higher than that.
> + my $e = $? >> 8;
> + if ($e > 2) {
if ($e > 1) {
??
> + die "$tmpfile: $!\n";
> + }
> unlink $tmpfile;
> }
> exit 0;
> --
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
