summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorville <ville@localhost>2009-11-24 18:58:59 +0000
committerville <ville@localhost>2009-11-24 18:58:59 +0000
commita0d3291a7ee90c37db171517f3151db20ee9735b (patch)
tree1ae9c32ad405a755011eb2e16582ce8ece1cf270
parentfa59ca83a3591ae2e036634088c70f56a60a4363 (diff)
downloadmarkup-validator-a0d3291a7ee90c37db171517f3151db20ee9735b.zip
markup-validator-a0d3291a7ee90c37db171517f3151db20ee9735b.tar.gz
markup-validator-a0d3291a7ee90c37db171517f3151db20ee9735b.tar.bz2
Fix perlcritic "Heredoc terminator must be quoted" errors.
-rwxr-xr-xhttpd/cgi-bin/check14
-rwxr-xr-xhttpd/cgi-bin/sendfeedback.pl4
-rwxr-xr-xmisc/docs_errors.pl4
-rwxr-xr-xmisc/spmpp.pl6
4 files changed, 12 insertions, 16 deletions
diff --git a/httpd/cgi-bin/check b/httpd/cgi-bin/check
index dee3e2a..97c7276 100755
--- a/httpd/cgi-bin/check
+++ b/httpd/cgi-bin/check
@@ -14,7 +14,7 @@
# This source code is available under the license at:
# http://www.w3.org/Consortium/Legal/copyright-software
#
-# $Id: check,v 1.727 2009-11-24 18:53:34 ville Exp $
+# $Id: check,v 1.728 2009-11-24 18:58:59 ville Exp $
#
# We need Perl 5.8.0+.
@@ -133,7 +133,7 @@ BEGIN {
$CFG = \%cfg;
};
if ($@) {
- die <<EOF;
+ die <<"EOF";
Could not read configuration. Set the W3C_VALIDATOR_CFG environment variable
or copy conf/* to /etc/w3c/. Make sure that the configuration file and all
included files are readable by the web server user. The error was:\n'$@'
@@ -148,12 +148,8 @@ EOF
my @_d = grep { not $paths{$_}->[0] } keys %paths;
my @_r = grep { not $paths{$_}->[1] } keys %paths;
return TRUE if (scalar(@_d) + scalar(@_r) == 0);
- die <<EOF if scalar @_d;
-Does not exist or is not a directory: @_d
-EOF
- die <<EOF if scalar @_r;
-Directory not readable (permission denied): @_r
-EOF
+ die "Does not exist or is not a directory: @_d\n" if scalar(@_d);
+ die "Directory not readable (permission denied): @_r\n" if scalar(@_r);
}
#
@@ -216,7 +212,7 @@ EOF
#
# Strings
- $VERSION = q$Revision: 1.727 $;
+ $VERSION = q$Revision: 1.728 $;
$VERSION =~ s/Revision: ([\d\.]+) /$1/;
#
diff --git a/httpd/cgi-bin/sendfeedback.pl b/httpd/cgi-bin/sendfeedback.pl
index b8bb3fb..11f7120 100755
--- a/httpd/cgi-bin/sendfeedback.pl
+++ b/httpd/cgi-bin/sendfeedback.pl
@@ -1,7 +1,7 @@
#!/usr/bin/perl -T
##
## feedback generator for W3C Markup Validation Service
-# # $Id: sendfeedback.pl,v 1.14 2009-11-23 22:24:15 ville Exp $
+# # $Id: sendfeedback.pl,v 1.15 2009-11-24 18:58:59 ville Exp $
## Pragmas.
use strict;
@@ -55,7 +55,7 @@ BEGIN {
$CFG = \%cfg;
};
if ($@) {
- die <<EOF;
+ die <<"EOF";
Could not read configuration. Set the W3C_VALIDATOR_CFG environment variable
or copy conf/* to /etc/w3c/. Make sure that the configuration file and all
included files are readable by the web server user. The error was:\n'$@'
diff --git a/misc/docs_errors.pl b/misc/docs_errors.pl
index 7ec0f81..606f661 100755
--- a/misc/docs_errors.pl
+++ b/misc/docs_errors.pl
@@ -2,7 +2,7 @@
##
## Generates HTML documentation of error messages and explanations
## for W3C Markup Validation Service
-## $Id: docs_errors.pl,v 1.13 2009-11-23 22:24:15 ville Exp $
+## $Id: docs_errors.pl,v 1.14 2009-11-24 18:58:59 ville Exp $
## Pragmas.
use strict;
@@ -53,7 +53,7 @@ BEGIN {
$CFG = \%cfg;
};
if ($@) {
- die <<EOF;
+ die <<"EOF";
Could not read configuration. Set the W3C_VALIDATOR_CFG environment variable
or copy conf/* to /etc/w3c/. Make sure that the configuration file and all
included files are readable by the web server user. The error was:\n'$@'
diff --git a/misc/spmpp.pl b/misc/spmpp.pl
index b988b99..2a88523 100755
--- a/misc/spmpp.pl
+++ b/misc/spmpp.pl
@@ -4,7 +4,7 @@
# for use in the Validator, from an OpenSP ParserMessages.rc.
# (spmpp = "SP Message Pre-Processor")
#
-# $Id: spmpp.pl,v 1.4 2009-11-23 22:24:15 ville Exp $
+# $Id: spmpp.pl,v 1.5 2009-11-24 18:58:59 ville Exp $
#
#
@@ -34,7 +34,7 @@ while (<FH>) {
}
close FH;
-print <<EOF;
+print <<"EOF";
#
# Automatically Generated by $0
#
@@ -53,7 +53,7 @@ EOF
# the last digit of the "muid" is replaced at runtime).
#
for (@msg) {
- print <<EOF;
+ print <<"EOF";
<msg $_->[0]>
original = $_->[1]
verbose <<.EOF.