X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fservice;h=9debab2694eb76c77a76f403bd70581e64292dc3;hb=13ec5025323d6fc900f601a6591d096afdb03549;hp=35cb4a0d385583c3e68d3487a3f5468753601d47;hpb=88362f1f6dab347b15cd9ea85c6f9ba50b97b43c;p=debbugs.git diff --git a/scripts/service b/scripts/service index 35cb4a0..9debab2 100755 --- a/scripts/service +++ b/scripts/service @@ -7,6 +7,9 @@ use warnings; use strict; +use locale; +use POSIX qw(strftime locale_h); +setlocale(LC_TIME, "C"); use Debbugs::Config qw(:globals :config); @@ -473,11 +476,13 @@ END transcript => $transcript, debug => $debug, ok => \$ok, + replyto => $replyto, ); if ($terminate_control) { last; } } else { + print {$transcript} "Unknown command or malformed arguments to command.\n"; $errors++; if (++$unknowns >= 5) { print {$transcript} "Too many unknown commands, stopping here.\n\n"; @@ -509,7 +514,7 @@ my $error_text = $errors > 0 ? " (with $errors errors)":''; my @common_headers; push @common_headers, 'X-Loop',$gMaintainerEmail; -my $temp_transcript = ${transcript_scalar}; +my $temp_transcript = $transcript_scalar; eval{ $temp_transcript = decode("utf8",$temp_transcript,Encode::FB_CROAK); }; @@ -542,19 +547,6 @@ my $repliedshow= join(', ',$replyto, ) ); -# -1 is the service.in log -&filelock("lock/-1"); -open(AP,">>db-h/-1.log") || die "open db-h/-1.log: $!"; -print(AP - "\2\n$repliedshow\n\5\n$reply\n\3\n". - "\6\n". - "Request received from ". - html_escape($header{'from'})."\n". - "to ".html_escape($controlrequestaddr)."\n". - "\3\n". - "\7\n",escape_log(@log),"\n\3\n") || die "writing db-h/-1.log: $!"; -close(AP) || die "open db-h/-1.log: $!"; -&unfilelock; utime(time,time,"db-h"); &sendmailmessage($reply,