diff options
| author | rillig <rillig> | 2007-10-31 19:24:52 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2007-10-31 19:24:52 +0000 |
| commit | 9cf2237bbf8be710dd4dc8e735ef2addb8da6a80 (patch) | |
| tree | 1a20ee23eb552d3a8cd770fcf585c5672a744b61 /pkgtools | |
| parent | fb7acb1987c14392c88a14b10d98e59238ecf1d5 (diff) | |
| download | pkgsrc-9cf2237bbf8be710dd4dc8e735ef2addb8da6a80.tar.gz | |
"Safe" variables should not have the :Q operator, since it only makes
the code harder to read and does not have any effect anyway.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index b5294cacc16..9b2c0f36b89 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.724 2007/10/31 12:24:48 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.725 2007/10/31 19:24:52 rillig Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -3247,6 +3247,8 @@ sub variable_needs_quoting($$$) { my $type = get_variable_type($line, $varname); my ($want_list, $have_list); + $opt_debug_trace and $line->log_debug("variable_needs_quoting($varname, " . $context->to_string() . ")"); + use constant safe_types => array_to_hash(qw( DistSuffix Filemask FileMode Filename @@ -3267,10 +3269,10 @@ sub variable_needs_quoting($$$) { # enumerations, are expected to not require the :Q operator. if (ref($type->basic_type) eq "HASH" || exists(safe_types->{$type->basic_type})) { if ($type->kind_of_list == LK_NONE) { - return doesnt_matter; + return false; } elsif ($type->kind_of_list == LK_EXTERNAL && $context->extent != VUC_EXTENT_WORD_PART) { - return doesnt_matter; + return false; } } @@ -4007,7 +4009,7 @@ sub checkline_mk_varuse($$$$) { } elsif ($type->kind_of_list == LK_INTERNAL) { # Fine. - } elsif ($needs_quoting == doesnt_matter) { + } elsif ($needs_quoting == doesnt_matter || $needs_quoting == false) { # Fine, these variables are assumed to not # contain special characters. @@ -4054,6 +4056,9 @@ sub checkline_mk_varuse($$$$) { if ($needs_quoting == false && $mod =~ qr":Q$") { $line->log_warning("The :Q operator should not be used for \${${varname}} here."); $line->explain_warning( +"Many variables in pkgsrc do not need the :Q operator, since they", +"are not expected to contain white-space or other evil characters.", +"", "When a variable of type ShellWord appears in a context that expects", "a shell word, it does not need to have a :Q operator. Even when it", "is concatenated with another variable, it still stays _one_ word.", |