diff options
| author | rillig <rillig@pkgsrc.org> | 2007-12-22 22:27:17 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2007-12-22 22:27:17 +0000 |
| commit | adf53f5a0d2ca97663bb03be9bb94edd8c26ecfe (patch) | |
| tree | 74f487c6a3ac2a6d5445bfc8060f3b4ac6ada0ba | |
| parent | 4db2670a5afa18f59b34dcbd03aa54080f6687fc (diff) | |
| download | pkgsrc-adf53f5a0d2ca97663bb03be9bb94edd8c26ecfe.tar.gz | |
Prevent internal errors when one-letter variables are used. The warning
to disambiguate them is still printed.
PR: 37593
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index 660e550aff9..d634f4d3cfb 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.741 2007/12/22 11:15:52 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.742 2007/12/22 22:27:17 rillig Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -1785,6 +1785,7 @@ my $regex_shellword = qr"\s*( | \`[^\`]*\` # backticks string | \\\$\$ # an escaped dollar sign | \\[^\$] # other escaped characters + | \$[\w_] # one-character make(1) variable | \$\{[^{}]+\} # make(1) variable | \$\([^()]+\) # make(1) variable, $(...) | \$[/\@<^] # special make(1) variables @@ -4223,7 +4224,7 @@ sub checkline_mk_shellword($$$) { # which state we are currently. } elsif ($rest =~ s/^\$\{(${regex_varname}|[\@])(:[^\{]+)?\}// || $rest =~ s/^\$\((${regex_varname}|[\@])(:[^\)]+)?\)// - || $rest =~ s/^\$(\@)//) { + || $rest =~ s/^\$([\w\@])//) { my ($varname, $mod) = ($1, $2); if ($varname eq "\@") { |