INN commit: trunk/frontends (mailpost.in pullnews.in)
INN Commit
Russ_Allbery at isc.org
Sat Apr 26 07:44:23 UTC 2008
Date: Saturday, April 26, 2008 @ 00:44:23
Author: iulius
Revision: 7792
Add some more parenthesis.
Both mailpost and pullnews were affected by this bug.
Modified:
trunk/frontends/mailpost.in
trunk/frontends/pullnews.in
-------------+
mailpost.in | 36 ++++++++++++++++++------------------
pullnews.in | 12 ++++++------
2 files changed, 24 insertions(+), 24 deletions(-)
Modified: mailpost.in
===================================================================
--- mailpost.in 2008-04-26 06:56:35 UTC (rev 7791)
+++ mailpost.in 2008-04-26 07:44:23 UTC (rev 7792)
@@ -289,8 +289,8 @@
if (!open TMPFILE,">$tmpfile") {
$msg = "can't open temp file ($tmpfile): $!" ;
$tmpfile = undef ;
- syslog "err", "$msg\n" unless $debugging || -t STDERR ;
- open TMPFILE, "|" . sprintf ($Sendmail, $Maintainer) ||
+ syslog("err", "$msg\n") unless $debugging || -t STDERR ;
+ open(TMPFILE, "|" . sprintf ($Sendmail, $Maintainer)) ||
die "die(no tmpfile): sendmail: $!\n" ;
print TMPFILE <<"EOF";
To: $Maintainer
@@ -345,20 +345,20 @@
my $lockfile = sprintf("%s.lock", $Database);
-open (LOCKFILE, "<$lockfile") ||
- open (LOCKFILE, ">$lockfile") ||
+open(LOCKFILE, "<$lockfile") ||
+ open(LOCKFILE, ">$lockfile") ||
mailArtAndDie ("can't open $lockfile: $!") ;
my $i ;
for ($i = 0 ; $i < 5 ; $i++) {
- flock LOCKFILE, $LOCK_EX && last ;
+ flock(LOCKFILE, $LOCK_EX) && last ;
sleep 1 ;
}
mailArtAndDie ("can't lock $lockfile: $!") if ($i == 5) ;
my %DATABASE ;
-dbmopen %DATABASE, $Database, 0666 || mailArtAndDie ("can't dbmopen $Database: $!");
+dbmopen(%DATABASE, $Database, 0666) || mailArtAndDie ("can't dbmopen $Database: $!");
if (defined $DATABASE{$message_id}) {
@@ -374,9 +374,9 @@
mailArtAndDie ("TAS didn't set $message_id") unless defined $DATABASE{$message_id};
-dbmclose %DATABASE || mailArtAndDie ("can't dbmclose $Database: $!") ;
+dbmclose(%DATABASE) || mailArtAndDie ("can't dbmclose $Database: $!") ;
-flock LOCKFILE, $LOCK_UN || mailArtAndDie ("can't unlock $lockfile: $!");
+flock(LOCKFILE, $LOCK_UN) || mailArtAndDie ("can't unlock $lockfile: $!");
close LOCKFILE ;
## For crosspost.
@@ -388,29 +388,29 @@
}
sleep $opt_c ;
- open (LOCKFILE, "<$lockfile") ||
- open (LOCKFILE, ">$lockfile") ||
+ open(LOCKFILE, "<$lockfile") ||
+ open(LOCKFILE, ">$lockfile") ||
mailArtAndDie ("can't open $lockfile: $!") ;
my $i ;
for ($i = 0 ; $i < 5 ; $i++) {
- flock LOCKFILE, $LOCK_EX && last ;
+ flock(LOCKFILE, $LOCK_EX) && last ;
sleep 1 ;
}
mailArtAndDie ("can't lock $lockfile: $!") if ($i == 5) ;
my $umask_bak = umask();
umask(000);
- dbmopen %DATABASE, $Database, 0666 || mailArtAndDie ("can't dbmopen $Database: $!");
+ dbmopen(%DATABASE, $Database, 0666) || mailArtAndDie ("can't dbmopen $Database: $!");
umask($umask_bak);
my $dup = undef ;
syslog "err", "check " . $DATABASE{$message_id} . " : $newsgroups\n" if $debugging ;
$dup = 1 if ($DATABASE{$message_id} ne $newsgroups) ;
- dbmclose %DATABASE || mailArtAndDie ("can't dbmclose $Database: $!") ;
+ dbmclose(%DATABASE) || mailArtAndDie ("can't dbmclose $Database: $!") ;
- flock LOCKFILE, $LOCK_UN || mailArtAndDie ("can't unlock $lockfile: $!");
+ flock(LOCKFILE, $LOCK_UN) || mailArtAndDie ("can't unlock $lockfile: $!");
close LOCKFILE ;
if (defined($dup)) {
@@ -419,7 +419,7 @@
}
# Replace Newsgroups:.
- open TMPFILE, "$tmpfile" || mailArtAndDie ("can't open temp file ($tmpfile): $!") ;
+ open(TMPFILE, "$tmpfile") || mailArtAndDie ("can't open temp file ($tmpfile): $!") ;
$tmpfile2 = sprintf "%s/mailpost-crosspost.%d.%d", $Tmpdir, time, $$ ;
if ( !open TMPFILE2, ">$tmpfile2") {
$msg = "can't open temp file ($tmpfile2): $!" ;
@@ -446,7 +446,7 @@
print TMPFILE2 $rest;
close TMPFILE2 ;
close TMPFILE ;
- rename $tmpfile2, $tmpfile || mailArtAndDie ("can't rename $tmpfile2 $tmpfile: $!") ;
+ rename($tmpfile2, $tmpfile) || mailArtAndDie ("can't rename $tmpfile2 $tmpfile: $!") ;
$tmpfile2 = undef ;
}
@@ -473,7 +473,7 @@
print STDERR $msg,"\n" if -t STDERR ;
- open SENDMAIL, "|" . sprintf ($Sendmail,$Maintainer) ||
+ open(SENDMAIL, "|" . sprintf ($Sendmail,$Maintainer)) ||
die "die($msg): sendmail: $!\n" ;
print SENDMAIL <<"EOF" ;
To: $Maintainer
@@ -485,7 +485,7 @@
if ($tmpfile && -f $tmpfile) {
print SENDMAIL "\n-------- Article Contents\n\n" ;
- open FILE, "<$tmpfile" || die "open($tmpfile): $!\n" ;
+ open(FILE, "<$tmpfile") || die "open($tmpfile): $!\n" ;
print SENDMAIL while <FILE> ;
close FILE ;
} else {
Modified: pullnews.in
===================================================================
--- pullnews.in 2008-04-26 06:56:35 UTC (rev 7791)
+++ pullnews.in 2008-04-26 07:44:23 UTC (rev 7792)
@@ -139,15 +139,15 @@
my %passwd = ();
if ($rnews) {
- open RNEWS, ">$rnews" ||
+ open(RNEWS, ">$rnews") ||
die "cant open rnews-format ouptut: $rnews: $!\n";
if ($rnews eq "-") {
- open LOG, ">/dev/null" || die "can\'t open /dev/null!: $!\n";
+ open(LOG, ">/dev/null") || die "can\'t open /dev/null!: $!\n";
} else {
- open LOG, ">&STDOUT" || die "can't dup stdout!: $!\n";
+ open(LOG, ">&STDOUT") || die "can't dup stdout!: $!\n";
}
} else {
- open LOG, ">&STDOUT" || die "can't dup stdout!: $!\n";
+ open(LOG, ">&STDOUT") || die "can't dup stdout!: $!\n";
}
my $oldfh = select ;
@@ -175,7 +175,7 @@
print LOG "\n";
}
-open FILE, "<$groupFile" || die "cant open group file $groupFile\n" ;
+open(FILE, "<$groupFile") || die "can't open group file $groupFile\n" ;
while (<FILE>) {
next if m!^\s*\#! || m!^\s*$! ;
@@ -336,7 +336,7 @@
sub saveConfig {
$SIG{INT} = $SIG{QUIT} = 'IGNORE';
- open FILE,">$groupFile" || die "cant open $groupFile: $!\n" ;
+ open(FILE,">$groupFile") || die "can't open $groupFile: $!\n" ;
my $server ;
my $group ;
More information about the inn-committers
mailing list