chiark
/
gitweb
/
~webstump
/
modbot-mtm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Actual error messages
[modbot-mtm.git]
/
stump
/
bin
/
submission.pl
diff --git
a/stump/bin/submission.pl
b/stump/bin/submission.pl
index fe02ca8e36a25d584686aa2d6d22b93243640a5f..a6f05fd6c6f0cf8522cfc90e2f6996528b107c9b 100755
(executable)
--- a/
stump/bin/submission.pl
+++ b/
stump/bin/submission.pl
@@
-184,8
+184,8
@@
print STDERR "FromSig = $FromSig, good = $good\n" if $FromSig;
# checks charter calling conforms_charter
#
sub checkCharter {
# checks charter calling conforms_charter
#
sub checkCharter {
- open( VERIFY, "|conforms_charter" );
- print VERIFY $Body;
+ open( VERIFY, "|conforms_charter" )
or die $!
;
+ print VERIFY $Body
or die $!
;
close( VERIFY );
return $? == 0;
close( VERIFY );
return $? == 0;
@@
-298,22
+298,22
@@
sub ignoreHeader {
sub readMessage {
sub readMessage {
-open IWJL, ">>/home/webstump/t.log";
-print IWJL "=========== SUBMISSION READMESSAGE\n";
+
#
open IWJL, ">>/home/webstump/t.log";
+
#
print IWJL "=========== SUBMISSION READMESSAGE\n";
- open( TMPFILE, "> $TmpFile" );
+ open( TMPFILE, "> $TmpFile" )
or die $!
;
$IsBody = 0;
while( <> ) {
$IsBody = 0;
while( <> ) {
-print IWJL "SbRm $_\n";
+
#
print IWJL "SbRm $_\n";
$Body .= $_;
if( !$IsBody && &ignoreHeader( $_ ) ) {
next;
}
$Body .= $_;
if( !$IsBody && &ignoreHeader( $_ ) ) {
next;
}
- print TMPFILE;
+ print TMPFILE
or die $!
;
chop;
chop;
@@
-367,7
+367,7
@@
print STDERR "BAD NEWSSERVER\n";
}
}
use IO::Handle;
}
}
use IO::Handle;
- print IWJL "SbRmE $!\n";
+
#
print IWJL "SbRmE $!\n";
die "read message $! !" if STDIN->error;
close( TMPFILE );
die "read message $! !" if STDIN->error;
close( TMPFILE );
@@
-402,8
+402,8
@@
$command = &Filter;
# process
print STDERR "command = $command\n";
# process
print STDERR "command = $command\n";
-open IWJL, ">>/home/webstump/t.log";
-print IWJL "=========== SUBMISSION MAIN\n";
+
#
open IWJL, ">>/home/webstump/t.log";
+
#
print IWJL "=========== SUBMISSION MAIN\n";
open( COMMAND, "| $command" ) or die $!;
open( TMPFILE, "$TmpFile" ) || die "cant open tmpfile";
open( COMMAND, "| $command" ) or die $!;
open( TMPFILE, "$TmpFile" ) || die "cant open tmpfile";
@@
-426,10
+426,10
@@
open( TMPFILE, "$TmpFile" ) || die "cant open tmpfile";
}
if( /^From / ) {
}
if( /^From / ) {
- print COMMAND;
- print COMMAND "X-Origin: $X_Origin, $_" if $X_Origin;
+ print COMMAND
or die $!
;
+ print COMMAND "X-Origin: $X_Origin, $_"
or die $!
if $X_Origin;
print STDERR "Subject =`$Subject'\n";
print STDERR "Subject =`$Subject'\n";
- print COMMAND "Subject: No subject given\n" if !$Subject;
+ print COMMAND "Subject: No subject given\n"
or die $!
if !$Subject;
# nothing
} elsif( /^From: / && !$IsBody) {
next if $FromWasUsed;
# nothing
} elsif( /^From: / && !$IsBody) {
next if $FromWasUsed;
@@
-439,20
+439,20
@@
open( TMPFILE, "$TmpFile" ) || die "cant open tmpfile";
# "From: " to go to headers!
if( $From ) {
# "From: " to go to headers!
if( $From ) {
- print COMMAND "$From\n";
+ print COMMAND "$From\n"
or die $!
;
$From = "";
} else {
$From = "";
} else {
- print COMMAND;
+ print COMMAND
or die $!
;
}
} elsif( /^Newsgroups: / && !$IsBody ) {
}
} elsif( /^Newsgroups: / && !$IsBody ) {
- print COMMAND "Newsgroups: $Newsgroups\n";
+ print COMMAND "Newsgroups: $Newsgroups\n"
or die $!
;
} else {
} else {
- print COMMAND;
+ print COMMAND
or die $!
;
}
}
close( TMPFILE ) or die $!;
}
}
close( TMPFILE ) or die $!;
-close( COMMAND ) or die
$!
;
+close( COMMAND ) or die
"$? $!"
;
################################################################## Archiving
# archive
################################################################## Archiving
# archive