| @@ -1,15 +1,15 @@ | | | @@ -1,15 +1,15 @@ |
| 1 | #! @PERL@ | | 1 | #! @PERL@ |
| 2 | # $NetBSD: pkglint.pl,v 1.844 2012/08/01 22:19:01 asau Exp $ | | 2 | # $NetBSD: pkglint.pl,v 1.845 2012/08/03 09:07:21 asau Exp $ |
| 3 | # | | 3 | # |
| 4 | | | 4 | |
| 5 | # pkglint - static analyzer and checker for pkgsrc packages | | 5 | # pkglint - static analyzer and checker for pkgsrc packages |
| 6 | # | | 6 | # |
| 7 | # Written by: | | 7 | # Written by: |
| 8 | # Roland Illig <rillig@NetBSD.org> | | 8 | # Roland Illig <rillig@NetBSD.org> |
| 9 | # | | 9 | # |
| 10 | # Based on work by: | | 10 | # Based on work by: |
| 11 | # Hubert Feyrer <hubertf@NetBSD.org> | | 11 | # Hubert Feyrer <hubertf@NetBSD.org> |
| 12 | # Thorsten Frueauf <frueauf@NetBSD.org> | | 12 | # Thorsten Frueauf <frueauf@NetBSD.org> |
| 13 | # Thomas Klausner <wiz@NetBSD.org> | | 13 | # Thomas Klausner <wiz@NetBSD.org> |
| 14 | # and others. | | 14 | # and others. |
| 15 | # | | 15 | # |
| @@ -2743,27 +2743,27 @@ sub var_is_defined($) { | | | @@ -2743,27 +2743,27 @@ sub var_is_defined($) { |
| 2743 | if (defined($pkgctx_vardef)) { | | 2743 | if (defined($pkgctx_vardef)) { |
| 2744 | return $pkgctx_vardef->{$varname} if exists($pkgctx_vardef->{$varname}); | | 2744 | return $pkgctx_vardef->{$varname} if exists($pkgctx_vardef->{$varname}); |
| 2745 | return $pkgctx_vardef->{$varcanon} if exists($pkgctx_vardef->{$varcanon}); | | 2745 | return $pkgctx_vardef->{$varcanon} if exists($pkgctx_vardef->{$varcanon}); |
| 2746 | } | | 2746 | } |
| 2747 | return false; | | 2747 | return false; |
| 2748 | } | | 2748 | } |
| 2749 | | | 2749 | |
| 2750 | sub determine_used_variables($) { | | 2750 | sub determine_used_variables($) { |
| 2751 | my ($lines) = @_; | | 2751 | my ($lines) = @_; |
| 2752 | my ($rest); | | 2752 | my ($rest); |
| 2753 | | | 2753 | |
| 2754 | foreach my $line (@{$lines}) { | | 2754 | foreach my $line (@{$lines}) { |
| 2755 | $rest = $line->text; | | 2755 | $rest = $line->text; |
| 2756 | while ($rest =~ s/(?:\$\{|defined\(|empty\()([0-9+.A-Z_a-z]+)[:})]//) { | | 2756 | while ($rest =~ s/(?:\$\{|\$\(|defined\(|empty\()([0-9+.A-Z_a-z]+)[:})]//) { |
| 2757 | my ($varname) = ($1); | | 2757 | my ($varname) = ($1); |
| 2758 | use_var($line, $varname); | | 2758 | use_var($line, $varname); |
| 2759 | $opt_debug_unused and $line->log_debug("Variable ${varname} is used."); | | 2759 | $opt_debug_unused and $line->log_debug("Variable ${varname} is used."); |
| 2760 | } | | 2760 | } |
| 2761 | } | | 2761 | } |
| 2762 | } | | 2762 | } |
| 2763 | | | 2763 | |
| 2764 | sub extract_used_variables($$) { | | 2764 | sub extract_used_variables($$) { |
| 2765 | my ($line, $text) = @_; | | 2765 | my ($line, $text) = @_; |
| 2766 | my ($rest, $result); | | 2766 | my ($rest, $result); |
| 2767 | | | 2767 | |
| 2768 | $rest = $text; | | 2768 | $rest = $text; |
| 2769 | $result = []; | | 2769 | $result = []; |