modules: say warnings on stdout, not stderr

"scan.pl inbound >logfile" now works.

diff --git a/modules/FIDOMAIL.pm b/modules/FIDOMAIL.pm
index 4c8d1196f8d3f60b8c4c15b95e14bff1572c0474..0a9c4dfa5c7e3d180dbbe0b145573dd76c1f8b7b 100644 (file)
--- a/modules/FIDOMAIL.pm
+++ b/modules/FIDOMAIL.pm
@@ -93,14 +93,14 @@ sub read_message($)
                                        $charset =
                                        $MISC::charsets{from}->{$data};
                                } else {
-                                       warn("Unknown CHRS '$data'!");
+                                       say("Unknown CHRS '$data'!");
                                }
                        } elsif($kludge =~ /CODEPAGE/) {
                                if($MISC::charsets{from}->{"CP$data 2"}) {
                                        $charset =
                                        $MISC::charsets{from}->{"CP$data 2"};
                                } else {
-                                       warn("Unknown CODEPAGE '$data'");
+                                       say("Unknown CODEPAGE '$data'");
                                }
                        } elsif($kludge =~ /INTL/) {
                                $intl = $data;
@@ -112,7 +112,7 @@ sub read_message($)
                                # FIXME: ignored
                        } else {
                                # FIXME: generic header
-                               warn("Unknown kludge '$kludge' '$data'");
+                               say("Unknown kludge '$kludge' '$data'");
                        }
                next;
                }
@@ -151,14 +151,14 @@ sub read_message($)
                                        $mail{to} = [ $1, $2, $3, 0 ];
                                }
                        } else {
-                               warn("Cannot parse INTL: '$intl'");
+                               say("Cannot parse INTL '$intl' (fname=$mail{fname})!");
                        }
                } elsif($mail{packet}) {
-                       warn("Took FROM/TO from packet!");
+                       say("Took FROM/TO from packet (fname=$mail{fname})!");
                        $mail{from} = $mail{packet}->{from};
                        $mail{to}   = $mail{packet}->{to};
                } else {
-                       warn("Don't know FROM/TO address!");
+                       say("Don't know FROM/TO address (fname=$mail{fname})!");
                        $mail{from} = [ 0, 0, 0, 0 ];
                        $mail{to}   = [ 0, 0, 0, 0 ];
                }
@@ -182,7 +182,7 @@ sub read_message($)
                        $mail{from} = [ @addr[0..3] ];
                } else {
                # --> use 0:0/0.0 as unknown address
-                       warn "Don't know FROM address!";
+                       say("Don't know FROM address (fname=$mail{fname})!");
                        $mail{from} = [ 0, 0, 0, 0 ];
                }
        }

diff --git a/modules/MISC.pm b/modules/MISC.pm
index e6c09123d18934b788fb82fb3712bf725474cbcb..b21bf102b5db3e667d83a27e33e0e4fb16e98bfd 100644 (file)
--- a/modules/MISC.pm
+++ b/modules/MISC.pm
@@ -91,7 +91,7 @@ sub read_datestring($)
                ($year, $month, $day)     = ($3, $months{$2}, $1);
                ($hour, $minute, $second) = ($4, $5, $6);
        } else {
-               warn("Unknown date format '$_'");
+               say("Unknown date format '$_'");
                return(undef);
        }
 

diff --git a/modules/MSGBASE.pm b/modules/MSGBASE.pm
index dd79dcf83bdce6f6c8fd06cb04a6b62e94ad6217..e773d2a829c30aca7892212189bbb4b5ea6c2263 100644 (file)
--- a/modules/MSGBASE.pm
+++ b/modules/MSGBASE.pm
@@ -150,13 +150,14 @@ sub mail_add($$)
                        ( $mail->{msgid} )
                );
                if($dupes) {
-                       warn(sprintf("DUPE: msgid='%s', '%s' => '%s'\n",
+                       say(sprintf("DUPE: msgid='%s', '%s' => '%s'",
                                $dupes->[0], $dupes->[1],
                                $dupes->[2], $dupes->[3]));
                        return(undef);
                }
        } else {
-               warn("Adding mail without MSGID to $handle->{area}!");
+               say("Adding mail without MSGID to $handle->{area}: ",
+                       "$mail->{fname} => $mail->{tname}!");
        }
 
        # store mail in msgbase