#!/usr/bin/perl -w
-# $Id: t-prot,v 1.218 2005/02/02 13:46:42 jochen Exp $
+# $Id: t-prot,v 1.269 2010/01/05 12:05:03 jochen Exp $
require 5.006;
use strict;
use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
use Getopt::Mixed qw(nextOption);
-use constant VER => '1.49';
+use constant VER => '2.11';
use constant REV => '';
-use constant REL => q$Revision: 1.218 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL => q$Revision: 1.269 $=~m/(\d+(?:\.\d+)+)/;
# MTA expecting mail on STDIN
# (you might have to adjust this if using a different MTA)
use constant SENDMAIL => '/usr/sbin/sendmail -oi';
use constant EX_USAGE => 64;
use constant EX_DATAERR => 65;
use constant EX_UNAVAILABLE => 69;
+use constant EX_SOFTWARE => 70;
use constant EX_IOERR => 74;
use constant EX_BOUNCE => EX_UNAVAILABLE;
use vars qw(
$ad $ads $bigqn $bigqx $boun $check $check_ratio $cr $diff $elli
$footers $ftr_ad $ftr_ml $hdrs $indent $kamm $kdiff $kminl $kmaxl
- $lax $lsig $maxsig $mda $ml $ms $ms_smart $msg_quote $msg_ratio
- $mua $ofile $pgpshort $pgpmove $pgpmovevrf $sig $sigint $sign
- $spass $spass_prefix $sysl $trad $trsp
+ $lax $lsig $maxsig $maxlines $mda $ml $gw $ms $ms_smart $msg_quote
+ $msg_ratio $mua $nohdr $ofile $pgpshort $pgpmove $pgpmovevrf $sig
+ $sigint $sign $spass $spass_prefix $sysl $trad $trsp
$gpg_WARNING $gpg_Warning $gpg_Cantcheck $gpg_aka $gpg_bad
$gpg_expired $gpg_good $gpg_bug
# command line can change them or they are used in rexexp's):
$0 =~ s!^.*/!!;
$maxsig = 4; # max. valid signature length
+$maxlines = undef; # no limit of message lines
$indent = '>'; # Indent string, regexp to identify a quoted line
$kminl = 65; # see decomb() for details
$kmaxl = 80;
$ftr_ml = undef; # too hard on performance to be default
$ofile = '-'; # use STDOUT if nothing is specified
$spass_prefix = 'SPAM: ';
-$check_ratio = .75; # 3/4 tofu is enough not to accept the message
+$check_ratio = 0; # off by default
$msg_quote = "Blocked by $0: This message has been rejected because of a full quote. Please see http://learn.to/quote/ and http://www.escape.de/users/tolot/mutt/ for more info. Have a nice day!\n";
$msg_ratio = "Blocked by $0: This message has been rejected because of excessive quoting. Please see http://learn.to/quote/ and http://www.escape.de/users/tolot/mutt/ for more info. Have a nice day!\n";
# end of user adjusted vals
-# mutt's locales as in mutt-1.3.28 up to mutt-1.4.2.1 {{{
-my %mutt_attachment = (
- 'bg' => '[-- Ïðèêà÷åí ôàéë: #',
- 'ca' => '[-- Fitxer adjunt #',
- 'cs' => '[-- Pøíloha #',
- 'da' => '[-- Brevdel #',
- 'de' => '[-- Anhang #',
- 'el' => '[-- ÐñïóÜñôçóç #',
- 'eo' => '[-- Parto #',
- 'es' => '[-- Archivo adjunto #',
- 'et' => '[-- Lisa #',
- 'fr' => '[-- Attachement #',
- 'gl' => '[-- Adxunto #',
- 'hu' => '[-- Melléklet #',
- 'id' => '[-- Lampiran #',
- 'it' => '[-- Allegato #',
- 'ja' => '[-- źÉÕ¥Õ¥¡¥¤¥ë #',
- 'ko' => '[-- ÷ºÎ¹° #',
- 'lt' => '[-- Priedas #',
- 'nl' => '[-- Bijlage #',
- 'pl' => '[-- Za³±cznik #',
- 'pt_BR' => '[-- Anexo No.',
- 'ru' => '[-- ÷ÌÏÖÅÎÉÅ #',
- 'sk' => '[-- Príloha #',
- 'sv' => '[-- Bilaga #',
- 'tr' => '[-- Eklenti #',
- 'uk' => '[-- äÏÄÁÔÏË ÎÏÍÅÒ ',
- 'zh_CN' => '[-- ¸½¼þ #',
- 'zh_TW' => '[-- 附件 #'
-);
-my %mutt_contenttype = (
- 'bg' => '[-- Òèï: ',
- 'ca' => '[-- Tipus: ',
- 'cs' => '[-- Typ: ',
- 'de' => '[-- Typ: ',
- 'el' => '[-- Ôýðïò: ',
- 'eo' => '[-- Speco: ',
- 'es' => '[-- Tipo: ',
- 'et' => '[-- Tüüp: ',
- 'fr' => '[-- Type : ',
- 'gl' => '[-- Tipo: ',
- 'hu' => '[-- Típus: ',
- 'id' => '[-- Jenis: ',
- 'it' => '[-- Tipo: ',
- 'ja' => '[-- ¥¿¥¤¥×: ',
- 'ko' => '[-- Á¾·ù: ',
- 'lt' => '[-- Tipas: ',
- 'pl' => '[-- Typ: ',
- 'pt_BR' => '[-- Tipo: ',
- 'ru' => '[-- ôÉÐ: ',
- 'sk' => '[-- Typ: ',
- 'sv' => '[-- Typ: ',
- 'tr' => '[-- Tip: ',
- 'uk' => '[-- ôÉÐ: ',
- 'zh_CN' => '[-- ÐÎ̬: ',
- 'zh_TW' => '[-- 種類：'
-);
-my %mutt_pgpsigned = (
- 'bg' => '[-- Êðàé íà ïîäïèñàíèòå äàííè --]',
- 'ca' => '[-- Final de les dades signades. --]',
- 'cs' => '',
- 'da' => '[-- Slut på underskrevne data --]',
- 'de' => '[-- Ende der signierten Daten --]',
- 'el' => '[-- ÔÝëïò äåäïìÝíùí õðïãåãñáììÝíùí --]',
- 'eo' => '[-- Fino de subskribitaj datenoj --]',
- 'es' => '',
- 'et' => '[-- Allkirjastatud info lõpp --]',
- 'fr' => '[-- Fin des données signées --]',
- 'gl' => '',
- 'hu' => '',
- 'id' => '[-- Akhir data yang ditandatangani --]',
- 'it' => '[-- Fine dei dati firmati --]',
- 'ja' => '[-- ½ð̾¥Ç¡¼¥¿½ªÎ» --]',
- 'ko' => '[-- ¼¸í ÀÚ·á ³¡ --]',
- 'lt' => '',
- 'nl' => '',
- 'pl' => '[-- Koniec podpisanych danych --]',
- 'pt_BR' => '',
- 'ru' => '[-- ëÏÎÅà ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]',
- 'sk' => '',
- 'sv' => '[-- Slut på signerat data --]',
- 'tr' => '',
- 'uk' => '[-- ë¦ÎÅÃØ Ð¦ÄÐÉÓÁÎÉÈ ÄÁÎÉÈ --]',
- 'zh_CN' => '',
- 'zh_TW' => ''
-);
-my %mutt_beginsigned = (
- 'bg' => '[-- Ñëåäíèòå äàííè ñà ïîäïèñàíè --]',
- 'ca' => '[-- Les dades següents es troben signades: --]',
- 'cs' => '[-- Následují podepsaná data --]',
- 'da' => '[-- Følgende data er underskrevet --]',
- 'de' => '[-- Die folgenden Daten sind signiert --]',
- 'el' => '[-- Ôá åðüìåíá äåäïìÝíá åßíáé õðïãåãñáììÝíá --]',
- 'eo' => '[-- La sekvaj datenoj estas subskribitaj --]',
- 'es' => '[-- Los siguientes datos están firmados --]',
- 'et' => '[-- Järgnev info on allkirjastatud --]',
- 'fr' => '[-- Les données suivantes sont signées --]',
- 'gl' => '[-- Os datos a continuación están asinados --]',
- 'hu' => '[-- A következõ adatok alá vannak írva --]',
- 'id' => '[-- Data berikut ini ditandatangani --]',
- 'it' => '[-- I seguenti dati sono firmati --]',
- 'ja' => '[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï½ð̾¤µ¤ì¤Æ¤¤¤ë --]',
- 'ko' => '[-- ¾Æ·¡ÀÇ ÀÚ·á´Â ¼¸í µÇ¾úÀ½ --]',
- 'lt' => '[-- Toliau einantys duomenys yra pasiraðyti --]',
- 'nl' => '[-- De volgende gegevens zijn PGP/MIME ondertekend --]',
- 'pl' => '[-- Poni¿sze dane s± podpisane --]',
- 'pt_BR' => '[-- Os dados a seguir estão assinados --]',
- 'ru' => '[-- îÁÞÁÌÏ ÐÏÄÐÉÓÁÎÎÙÈ ÄÁÎÎÙÈ --]',
- 'sk' => '[-- Nasledujúce dáta sú podpísané s PGP/MIME --]',
- 'sv' => '[-- Följande data är signerat --]',
- 'tr' => '[-- Bu bilgi imzalanmýþtýr --]',
- 'uk' => '[-- îÁÓÔÕÐΦ ÄÁΦ ЦÄÐÉÓÁÎÏ --]',
- 'zh_CN' => '[-- ÒÔϵÄ×ÊÁÏÒѱ»Ç©Êð --]',
- 'zh_TW' => '[-- 以下的資料已被簽署 --]',
-);
-my %mutt_pgpencrypted = (
- 'bg' => '[-- Êðàé íà PGP/MIME øèôðîâàíèòå äàííè --]',
- 'ca' => '[-- Final de les dades xifrades amb PGP/MIME. --]',
- 'cs' => '',
- 'da' => '[-- Slut på PGP/MIME-krypteret data --]',
- 'de' => '[-- Ende der PGP/MIME-verschlüsselten Daten --]',
- 'el' => '[-- ÔÝëïò äåäïìÝíùí êñõðôïãñáöçìÝíùí ìÝóù PGP/MIME --]',
- 'eo' => '[-- Fino de PGP/MIME-æifritaj datenoj --]',
- 'es' => '',
- 'et' => '[-- PGP/MIME krüptitud info lõpp --]',
- 'fr' => '[-- Fin des données chiffrées avec PGP/MIME --]',
- 'gl' => '',
- 'hu' => '',
- 'id' => '[-- Akhir data yang dienkripsi dg PGP/MIME --]',
- 'it' => '[-- Fine dei dati cifrati con PGP/MIME --]',
- 'ja' => '[-- PGP/MIME°Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]',
- 'ko' => '[-- PGP/MIME ¾ÏÈ£È ÀÚ·á ³¡ --]',
- 'lt' => '',
- 'nl' => '',
- 'pl' => '[-- Koniec danych zaszyfrowanych PGP/MIME --]',
- 'pt_BR' => '',
- 'ru' => '[-- ëÏÎÅà ÄÁÎÎÙÈ, ÚÁÛÉÆÒÏ×ÁÎÎÙÈ × ÆÏÒÍÁÔÅ PGP/MIME --]',
- 'sk' => '',
- 'sv' => '[-- Slut på data krypterad enligt PGP/MIME --]',
- 'tr' => '',
- 'uk' => '[-- ë¦ÎÅÃØ ÄÁÎÉÈ, ÚÁÛÉÆÒÏ×ÁÎÉÈ PGP/MIME --]',
- 'zh_CN' => '',
- 'zh_TW' => ''
-);
-my %mutt_pgpclearsigned = (
- 'bg' => '[-- ÊÐÀÉ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎÒÎ ÏÈÑÌÎ --]',
- 'ca' => '[-- TERMINA EL MISSATGE PGP SIGNAT --]',
- 'cs' => '',
- 'el' => '[-- ÔÅËÏÓ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]',
- 'eo' => '[-- FINO DE PGP-SUBSKRIBITA MESAØO --]',
- 'es' => '',
- 'et' => '[-- PGP ALLKIRJASTATUD TEATE LÕPP --]',
- 'fr' => '[-- FIN DE MESSAGE SIGNÉ PGP --]',
- 'gl' => '',
- 'hu' => '',
- 'id' => '[-- AKHIR PESAN DG TANDATANGAN PGP --]',
- 'it' => '[-- FINE DEL MESSAGGIO FIRMATO CON PGP --]',
- 'ja' => '[-- PGP½ð̾¥á¥Ã¥»¡¼¥¸½ªÎ» --]',
- 'ko' => '[-- PGP ¼¸í ¸ÞÀÏ ³¡ --]',
- 'lt' => '',
- 'nl' => '',
- 'pl' => '[-- KONIEC LISTU PODPISANEGO PGP --]',
- 'pt_BR' => '',
- 'ru' => '[-- ëÏÎÅà ÓÏÏÂÝÅÎÉÑ, ÐÏÄÐÉÓÁÎÎÏÇÏ PGP --]',
- 'sk' => '',
- 'sv' => '[-- SLUT PÅ MEDDELANDE SIGNERAT MED PGP --]',
- 'tr' => '',
- 'uk' => '[-- ë¦ÎÅÃØ ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]',
- 'zh_CN' => '',
- 'zh_TW' => ''
-);
-my %mutt_pgpclearsigstart = (
- 'bg' => '[-- ÍÀ×ÀËÎ ÍÀ PGP-ÏÎÄÏÈÑÀÍÎÒÎ ÏÈÑÌÎ --]',
- 'ca' => '[-- COMENÇA EL MISSATGE PGP SIGNAT --]',
- 'cs' => '[-- ZAÈÁTEK PODEPSANÉ PGP ZPRÁVY --]',
- 'el' => '[-- ÅÍÁÑÎÇ ÕÐÏÃÅÃÑÁÌÌÅÍÏÕ PGP ÌÇÍÕÌÁÔÏÓ --]',
- 'eo' => '[-- KOMENCO DE PGP-SUBSKRIBITA MESAØO --]',
- 'es' => '[-- PRINCIPIO DEL MENSAJE FIRMADO CON PGP --]',
- 'et' => '[-- PGP ALLKIRJASTATUD TEATE ALGUS --]',
- 'fr' => '[-- DÉBUT DE MESSAGE SIGNÉ PGP --]',
- 'gl' => '[-- COMEZA A MESAXE FIRMADA CON PGP --]',
- 'hu' => '[-- PGP ALÁÍRT LEVÉL KEZDÕDIK --]',
- 'id' => '[-- AWAL SURAT DG TANDATANGAN PGP --]',
- 'it' => '[-- INIZIO DEL MESSAGGIO FIRMATO CON PGP --]',
- 'ja' => '[-- PGP½ð̾¥á¥Ã¥»¡¼¥¸³«»Ï --]',
- 'ko' => '[-- PGP ¼¸í ¸ÞÀÏ ½ÃÀÛ --]',
- 'lt' => '[-- PGP PASIRAÐYTO LAIÐKO PRADÞIA --]',
- 'nl' => '[-- BEGIN PGP ONDERTEKEND BERICHT --]',
- 'pl' => '[-- POCZ¡TEK LISTU PODPISANEGO PGP --]',
- 'pt_BR' => '[-- INÍCIO DE MENSAGEM ASSINADA POR PGP --]',
- 'ru' => '[-- îÁÞÁÌÏ ÓÏÏÂÝÅÎÉÑ, ÐÏÄÐÉÓÁÎÎÏÇÏ PGP --]',
- 'sk' => '[-- ZAÈIATOK SPRÁVY PODPÍSANEJ S PGP --]',
- 'sv' => '[-- MEDDELANDE SIGNERAT MED PGP BÖRJAR --]',
- 'tr' => '[-- PGP IMZALANMIÞ ILETI BAÞI --]',
- 'uk' => '[-- ðÏÞÁÔÏË ÐÏצÄÏÍÌÅÎÎÑ Ú PGP ЦÄÐÉÓÏÍ --]',
- 'zh_CN' => '[-- PGP Ç©ÃûµÄÐżþ¿ªÊ¼ --]',
- 'zh_TW' => '[-- PGP 簽名的信件開始 --]'
-);
-my %mutt_pgpoutstart = (
- 'bg' => '[-- ñëåäâà ðåçóëòàòà îò PGP (òåêóùî âåìå: ',
- 'ca' => '[-- Aquesta és l\'eixida de PGP (data actual: ',
- 'cs' => '[-- následuje výstup PGP (aktuální èas: ',
- 'da' => '[-- PGP-uddata følger (aktuelt tidspunkt: ',
- 'de' => '[-- PGP-Ausgabe folgt (aktuelle Zeit: ',
- 'el' => '[-- Áêïëïõèåß Ýîïäïò ôïõ PGP (ôñÝ÷ïõóá þñá: ',
- 'eo' => '[-- Eligo de PGP sekvas (nuna horo: ',
- 'es' => '[-- Salida de PGP a continuación (tiempo actual: ',
- 'et' => '[-- järgneb PGP väljund (praegune aeg: ',
- 'fr' => '[-- La sortie PGP suit (heure courante : ',
- 'gl' => '[-- Saída PGP a continuación (hora actual: ',
- 'hu' => '[-- PGP kimenet következik (idõ: ',
- 'id' => '[-- Keluaran dari PGP (waktu skrg: ',
- 'it' => '[-- Segue l\'output di PGP (ora attuale: ',
- 'ja' => '[-- PGP ½ÐÎϤϰʲ¼¤ÎÄ̤ê (¸½ºß»þ¹ï: ',
- 'ko' => '[-- PGP Ãâ·Â (ÇöÀç ½Ã°£: ',
- 'lt' => '[-- Toliau PGP iðvestis (esamas laikas: ',
- 'nl' => '[-- PGP uitvoer volgt (Huidige tijd: ',
- 'pl' => '[-- Wynik dzia³ania PGP (bie¿±ca data i czas: ',
- 'pt_BR' => '[-- Saída do PGP a seguir (hora atual: ',
- 'ru' => '[-- òÅÚÕÌØÔÁÔ ÒÁÂÏÔÙ ÐÒÏÇÒÁÍÍÙ PGP (ÔÅËÕÝÅÅ ×ÒÅÍÑ: ',
- 'sk' => '[-- Nasleduje výstup PGP (aktuálny èas: ',
- 'sv' => '[-- Utdata från PGP följer (aktuell tid: ',
- 'tr' => '[-- PGP geri verisi (geçerli zaman: ',
- 'uk' => '[-- ÔÅËÓÔ ÎÁ ×ÉÈÏĦ PGP (ÞÁÓ: ',
- 'zh_CN' => '[-- ÒÔÏÂΪ PGP Êä³öµÄ×ÊÁÏ£¨ÏÖÔÚʱ¼ä£º ',
- 'zh_TW' => '[-- 以下為 PGP 輸出的資料（現在時間：'
-);
-my %mutt_pgpoutend = (
- 'bg' => '[-- Êðàé íà PGP-ðåçóëòàòà --]',
- 'ca' => '[-- Final de l\'eixida de PGP. --]',
- 'cs' => '[-- Konec výstupu PGP --]',
- 'da' => '[-- Slut på PGP-uddata --]',
- 'de' => '[-- Ende der PGP-Ausgabe --]',
- 'el' => '[-- ÔÝëïò ôçò åîüäïõ PGP --]',
- 'eo' => '[-- Fino de PGP-eligo --]',
- 'es' => '[-- Fin de salida PGP --]',
- 'et' => '[-- PGP väljundi lõpp --]',
- 'fr' => '[-- Fin de sortie PGP --]',
- 'gl' => '[-- Fin da saída PGP --]',
- 'hu' => '[-- PGP kimenet vége --]',
- 'id' => '[-- Akhir keluaran PGP --]',
- 'it' => '[-- Fine dell\'output di PGP --]',
- 'ja' => '[-- PGP½ÐÎϽªÎ» --]',
- 'ko' => '[-- PGP Ãâ·Â ³¡ --]',
- 'lt' => '[-- PGP iðvesties pabaiga --]',
- 'nl' => '[-- Einde van PGP uitvoer --]',
- 'pl' => '[-- Koniec komunikatów PGP --]',
- 'pt_BR' => '[-- Fim da saída do PGP --]',
- 'ru' => '[-- ëÏÎÅà ×Ù×ÏÄÁ ÐÒÏÇÒÁÍÍÙ PGP --]',
- 'sk' => '[-- Koniec výstupu PGP --]',
- 'sv' => '[-- Slut på utdata från PGP --]',
- 'tr' => '[-- PGP geri verisi sonu --]',
- 'uk' => '[-- ë¦ÎÅÃØ ÔÅËÓÔÕ ÎÁ ×ÉÈÏĦ PGP --]',
- 'zh_CN' => '[-- PGP Êä³ö²¿·Ý½áÊø --]',
- 'zh_TW' => '[-- PGP 輸出部份結束 --]'
-);
-# }}}
+
# set the defaults to the C locale
$mutt_attachment = '[-- Attachment #';
$mutt_contenttype = '[-- Type: ';
$mutt_pgpoutstart = '[-- PGP output follows (current time:';
$mutt_pgpoutend = '[-- End of PGP output --]';
-# gpg's locales as in gpg-1.4.0 {{{
-my %gpg_WARNING = (
- 'be' => '',
- 'ca' => 'AV�S: ',
- 'cs' => 'VAROVÁNÍ: ',
- 'da' => 'ADVARSEL: ',
- 'de' => 'WARNUNG: ',
- 'el' => 'ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ',
- 'eo' => 'AVERTO: ',
- 'es' => 'ATENCIÓN: ',
- 'et' => 'HOIATUS: ',
- 'fi' => 'VAROITUS: ',
- 'fr' => 'ATTENTION: ',
- 'gl' => 'AVISO: ',
- 'hu' => 'FIGYELEM: ',
- 'id' => 'PERINGATAN: ',
- 'it' => 'ATTENZIONE: ',
- 'ja' => '·Ù¹ð: ',
- 'pl' => 'OSTRZE¯ENIE: ',
- 'pt' => 'AVISO: ',
- 'pt_BR' => 'AVISO: ',
- 'ro' => 'AVERTISMENT: ',
- 'ru' => 'ВНИМАНИЕ: ',
- 'sk' => 'VAROVANIE: ',
- 'sv' => 'VARNING: ',
- 'tr' => 'UYARI: ',
- 'zh_CN' => '警告：我们不信任这把密钥！',
- 'zh_TW' => 'ĵ§i¡G§ÚÌ *¤£* «H¥ô³o§âª÷Æ_¡I'
-);
-my %gpg_Warning = (
- 'be' => '',
- 'ca' => 'AV�S: ',
- 'cs' => 'VAROVÁNÍ: ',
- 'da' => '',
- 'de' => 'Warnung: ',
- 'el' => 'ÐÑÏÅÉÄÏÐÏÉÇÓÇ: ',
- 'eo' => 'AVERTO: ',
- 'es' => 'ATENCIÓN: ',
- 'et' => 'HOIATUS: ',
- 'fi' => 'VAROITUS: ',
- 'fr' => 'AVERTISSEMENT: ',
- 'gl' => 'AVISO: ',
- 'hu' => 'FIGYELEM: ',
- 'id' => 'PERINGATAN: ',
- 'it' => 'ATTENZIONE: ',
- 'ja' => '·Ù¹ð: ',
- 'pl' => 'OSTRZE¯ENIE: ',
- 'pt' => 'CUIDADO: ',
- 'pt_BR' => 'CUIDADO: ',
- 'ro' => 'AVERTISMENT: ',
- 'ru' => 'ВНИМАНИЕ: ',
- 'sk' => 'VAROVANIE: ',
- 'sv' => 'VARNING: ',
- 'tr' => 'UYARI: ',
- 'zh_CN' => '警告：加密过的报文已经变造！',
- 'zh_TW' => 'ĵ§i¡G¥[±K¹Lªº°T®§¤w¸g³QÅܳy¤F¡I'
-);
-my %gpg_Cantcheck = (
- 'be' => '',
- 'ca' => 'No sha pogut comprovar la signatura: ',
- 'cs' => 'Nemohu ovìøit podpis: ',
- 'da' => 'Kan ikke tjekke signatur: ',
- 'de' => 'Unterschrift kann nicht geprüft werden: ',
- 'el' => 'Áäõíáìßá åëÝã÷ïõ ôçò õðïãñáöÞò: ',
- 'eo' => 'Ne povas kontroli subskribon: ',
- 'es' => 'Imposible comprobar la firma: ',
- 'et' => 'Allkirja ei saa kontrollida: ',
- 'fi' => 'Allekirjoitusta ei voi tarkistaa: ',
- 'fr' => 'Impossible de vérifier la signature: ',
- 'gl' => 'Non foi posible verifica-la sinatura: ',
- 'hu' => 'Nem tudom ellenõrizni az aláírást: ',
- 'id' => 'Tidak dapat memeriksa signature: ',
- 'it' => 'Impossibile controllare la firma: ',
- 'ja' => '½ð̾¤ò¸¡ºº¤Ç¤¤Þ¤»¤ó: ',
- 'pl' => 'Nie mo¿na sprawdziæ podpisu: ',
- 'pt' => 'Impossível verificar assinatura: ',
- 'pt_BR' => 'Impossível verificar assinatura: ',
- 'ro' => 'Nu pot verifica semnãtura: ',
- 'ru' => 'Не могу проверить подпись: ',
- 'sk' => 'Nemô¾em overi» podpis: ',
- 'sv' => 'Kan inte verifiera signaturen: ',
- 'tr' => 'İmza kontrol edilemedi: ',
- 'zh_CN' => '无法检查签字：',
- 'zh_TW' => 'µLªkÀˬdñ³¹¡G '
-);
-my %gpg_aka = (
- 'be' => '',
- 'ca' => ' alias ',
- 'cs' => ' alias ',
- 'da' => ' alias ',
- 'de' => ' alias ',
- 'el' => ' ãíùóôü óáí ',
- 'eo' => ' alinome ',
- 'es' => ' alias ',
- 'et' => ' ka ',
- 'fr' => ' alias « ',
- 'gl' => ' alias ',
- 'hu' => ' azaz ',
- 'id' => ' alias ',
- 'it' => ' alias ',
- 'ja' => ' ÊÌ̾¡È',
- 'pl' => ' alias ',
- 'pt' => ' ou ',
- 'pt_BR' => ' ou ',
- 'sk' => ' alias ',
- 'sv' => ' även känd som ',
- 'tr' => ' den ',
- 'zh_CN' => ' 亦即“',
- 'zh_TW' => ' ¥ç§Y '
-);
-my %gpg_bad = (
- 'be' => 'нерэчаісны хэш-альгарытм ',
- 'ca' => 'Signatura INCORRECTA de ',
- 'cs' => '©PATNÝ podpis od ',
- 'da' => 'DÅRLIG signatur fra ',
- 'de' => 'FALSCHE Unterschrift von ',
- 'el' => 'ÊÁÊÇ õðïãñáöÞ áðü ',
- 'eo' => 'MALBONA subskribo de ',
- 'es' => 'Firma INCORRECTA de ',
- 'et' => 'HALB allkiri kasutajalt ',
- 'fi' => 'VÄÄRÄ allekirjoitus lähettäjältä ',
- 'fr' => 'MAUVAISE signature de « ',
- 'gl' => 'Sinatura INCORRECTA de',
- 'hu' => 'ROSSZ aláírás a következõtõl: ',
- 'id' => 'signature BURUK dari ',
- 'it' => 'Firma NON corretta da ',
- 'ja' => '¡È',
- 'pl' => 'NIEPOPRAWNY podpis z³o¿ony przez ',
- 'pt' => 'Assinatura INCORRECTA de ',
- 'pt_BR' => 'Assinatura INCORRETA de ',
- 'ro' => 'Semnãturã INCORECTÃ din ',
- 'ru' => 'ПЛОХАЯ подпись от ',
- 'sk' => 'ZLÝ podpis od ',
- 'sv' => 'FELAKTIG signatur från ',
- 'tr' => 'KÖTÜ imza: ',
- 'zh_CN' => '已损坏的签字，来自于“',
- 'zh_TW' => '*·lÃa* ªºÃ±³¹¨Ó¦Û©ó '
-);
-my %gpg_expired = (
- 'be' => '',
- 'ca' => 'Nota: La clau ha caducat!',
- 'cs' => 'Poznámka: Skonèila platnost tohoto klíèe!',
- 'da' => 'Bemærk: Denne nøgle er forældet!',
- 'de' => 'Hinweis: Dieser Schlüssel ist verfallen!',
- 'el' => 'Óçìåßùóç: Áõôü ôï êëåéäß Ý÷åé ëÞîåé!',
- 'eo' => 'Noto: Æi tiu þlosilo eksvalidiøis!',
- 'es' => 'Nota: ¡Esta clave ha caducado!',
- 'et' => 'Märkus: See võti on aegunud!',
- 'fi' => 'Huom: Tämä avain on vanhentunut!',
- 'fr' => 'Note: Cette clé a expiré !',
- 'gl' => 'Nota: ¡Esta chave xa caducou!',
- 'hu' => 'Megjegyzés: Ez a kulcs lejárt!',
- 'id' => 'Catatan: Kunci ini telah berakhir!',
- 'it' => 'Nota: questa chiave è scaduta!',
- 'ja' => 'Ãí°Õ: ¤³¤Î¸°¤ÏËþλ¤Ç¤¹!',
- 'pl' => 'Uwaga: Data wa¿no¶ci tego klucza up³ynê³a!',
- 'pt' => 'Nota: Esta chave expirou!',
- 'pt_BR' => 'Nota: Esta chave expirou!',
- 'ro' => 'Notã: Aceastã cheie a expirat!',
- 'ru' => 'ПРЕДУПРЕЖДАЮ: Данный ключ просрочен!',
- 'sk' => 'Poznámka: Skonèila platnos» tohto kµúèa!',
- 'sv' => 'Obs: Giltighetstiden för denna nyckel har gått ut!',
- 'tr' => 'Bilgi: Bu anahtarın kullanım süresi dolmuştu!',
- 'zh_CN' => '注意：这把密钥已经过期了！',
- 'zh_TW' => '½Ðª`·N¡G³o§âª÷Æ_¤w¸g¹L´Á¤F¡I'
-);
-my %gpg_good = (
- 'be' => 'нерэчаісны хэш-альгарытм ',
- 'ca' => 'Signatura correcta de ',
- 'cs' => 'Dobrý podpis od ',
- 'da' => 'God signatur fra ',
- 'de' => 'Korrekte Unterschrift von ',
- 'el' => 'ÊáëÞ õðïãñáöÞ áðü ',
- 'eo' => 'Bona subskribo de ',
- 'es' => 'Firma correcta de ',
- 'et' => 'Korrektne allkiri kasutajalt ',
- 'fi' => 'Allekirjoitus täsmää lähettäjään ',
- 'fr' => 'Bonne signature de « ',
- 'gl' => 'Sinatura correcta de ',
- 'hu' => 'Jó aláírás a következõtõl: ',
- 'id' => 'Signature baik dari ',
- 'it' => 'Firma valida da ',
- 'ja' => '¡È',
- 'pl' => 'Poprawny podpis z³o¿ony przez ',
- 'pt' => 'Assinatura correcta de ',
- 'pt_BR' => 'Assinatura correta de ',
- 'ro' => 'Semnãturã bunã din ',
- 'ru' => 'Действительная подпись от ',
- 'sk' => 'Dobrý podpis od ',
- 'sv' => 'Korrekt signatur från ',
- 'tr' => 'Kullanıcı kimliği: ',
- 'zh_CN' => '完好的签字，来自于“',
- 'zh_TW' => '§¹¦nªºÃ±³¹¨Ó¦Û©ó '
-);
-my %gpg_bug = (
- 'be' => '',
- 'ca' => '... a�� �s un bug (',
- 'cs' => '... toto je chyba v programu (',
- 'da' => '... dette er en fejl (',
- 'de' => '... dies ist ein Bug (Programmfehler) (',
- 'el' => '... áõôü åßíáé bug (',
- 'eo' => '... æi tio estas cimo (',
- 'es' => '... esto es un bug (',
- 'et' => '... see on viga (',
- 'fi' => '...tämä on ohjelmistovika (',
- 'fr' => '... cest un bug (',
- 'gl' => '... isto é un erro (',
- 'hu' => 'Ez egy programhiba... (',
- 'id' => '... kesalahan (',
- 'it' => '... questo è un bug (',
- 'ja' => '... ¥Ð¥°¤Ç¤¹ (',
- 'pl' => '... to jest b³±d programu (',
- 'pt' => '... isto é um bug (',
- 'pt_BR' => '... isto é um bug (',
- 'ro' => '... acesta este un bug (',
- 'ru' => ' ... это ошибка (',
- 'sk' => '... toto je chyba v programe (',
- 'sv' => '... detta är ett fel i programmet (',
- 'tr' => '... bu bir yazılım hatası (',
- 'zh_CN' => '……这是个程序缺陷(',
- 'zh_TW' => '... ³o¬Oӷ岫 ('
-);
-# }}}
# set the defaults to the C locale
$gpg_WARNING = 'WARNING: ';
# (yes, the translations in gnupg's po files *are* braindamaged):
# help(): print help text and exit with appropriate exit code
sub help {
print "Usage: $0 [options]
- -a remove ad footers; requires -A
-A=DIRECTORY ad footer directory, treat ad footers as signature
+ -a remove ad footers; requires -A
--bigq[=n[,x]] remove all but x lines of quotes with more than n
lines; default is n=30 and x=10
+ --body input has no headers; does not work with --pgp-short;
+ multipart messages will not be detected
-c merge multiple blank lines
--check[=FLAGS] check various criteria, print error message and quit;
see man page for details
-e force ellipsis for excessive punctuation
--ftr-ad enable aggressive ad footer matching; requires -A
--ftr-ml enable aggressive mailing list footer matching; req. -L
+ --groupwise delete Novell Groupwise style TOFU
-h, --help show this short help and exit
-i=INFILE file to be read; '-' for STDIN (default)
-k try to fix \"Kammquotes\"
--kminl=n min. line length for wrapped line; requires -k
--kmaxl=n max. line length for wrapped line; requires -k
--kdiff=n max. length difference between wrapped lines; req. -k
- -L=DIRECTORY mailling list footer directory, treat mailing list
+ -L=DIRECTORY mailing list footer directory, treat mailing list
footers as signature
-l delete mailing list footer; requires -L
--lax-security use unsafe writing method; USE ON YOUR OWN RISK!
--locale=LOCALE internationalization; currently only used with -Mmutt
-M, --mua=MUA turn on special treatment for some mail user agents
-m delete MS style TOFU; careful: might be too agressive
+ --max-lines=x maximum number of message lines
--ms-smart try to be smart with MS style TOFU; req. -Mmutt and -m
-o=OUTFILE file to be written to; '-' for STDOUT (default), 'NONE'
for no output at all
$sigint = 1;
}
-# esc(): escapes a scalar reference for use in perl regexp
-sub esc { ${$_[0]} =~ s/([\[\]\(\)\*\.\-\^\$\@])/\\$1/go; }
-
# remove_footers(): remove any trailing appearance of footers contained
# in the given directory.
sub remove_footers {
}
if ($F && scalar(@$L)) {
- if (!opendir(DIR, $F)) { print STDERR "Could not open $F: $!\n"; exit(EX_IOERR); }
+ if (!opendir(DIR, $F))
+ { print STDERR "Could not open $F: $!\n"; exit(EX_IOERR); }
my @feet = grep { /^[^.]/ && -f "$F/$_" } readdir DIR;
closedir DIR;
foreach my $f (@feet) {
- if (!open(IN, "$F/$f")) { print STDERR "Could not open $F/$f: $!\n"; exit(EX_IOERR); }
+ if (!open(IN, "$F/$f"))
+ { print STDERR "Could not open $F/$f: $!\n"; exit(EX_IOERR); }
my @l = <IN>;
close IN;
for (my $z=0; $z<=$#l; $z++) { chomp($l[$z]); }
if (defined $V) {
- WIPE: for (my $z=scalar(@$L)-scalar(@l); $z>=0; $z--)
- {
+ WIPE: for (my $z=scalar(@$L)-scalar(@l); $z>=0; $z--) {
if (scalar(@l)+$z<=scalar(@$L)) {
my $y = 0;
for(my $x=1; $x<=scalar(@l); $x++) {
- if (index($$L[scalar(@$L)-$x-$z], $l[scalar(@l)-$x])!=0) {
+ if (index($$L[scalar(@$L)-$x-$z],
+ $l[scalar(@l)-$x])!=0) {
$y = 1;
}
}
# underlining some part of the line above (using '^')
# nor begin with a whitespace,
# * the 1st line must not end with a hyphen,
+ # * the 2nd line must not indicate content was deleted,
# * the 2nd line must not be some mutt(1) commentary,
# * there must not be a valid word wrap to produce a longer
# 1st line (if not quoted),
(index($$L[$x+1], $indent)!=0) &&
($$L[$x+1] !~ /^$/) &&
($$L[$x+1] !~ /^[\s^]/) &&
- ($$L[$x] !~ /-$/) &&
- ($mua ne 'mutt' || $$L[$x+1] !~ /^(?:\e.+?\a)?\[-- .* --]/) &&
+ ($$L[$x] !~ /-$/) &&
+ ($$L[$x+1] !~ /^\Q[...]\E\s*$/) &&
+ ($mua ne 'mutt' || $$L[$x+1] !~ /^(?:\e[^\a]+\a)?\[-- /) &&
(length($$L[$x])+index($$L[$x+1], ' ')>$max ||
- (index($$L[$x+1], ' ')<0 && length($$L[$x])+length($$L[$x+1])>$max)) &&
+ (index($$L[$x+1], ' ')<0 &&
+ length($$L[$x])+length($$L[$x+1])>$max)) &&
(length($$L[$x])+length($$L[$x+1])<$kmaxl) &&
(length($$L[$x])+length($$L[$x+1])>$kminl) &&
(length($$L[$x])-length($$L[$x+1])>$kdiff) &&
my $ok = 0;
while ($X<$Z) {
- if ($$L[$X] =~ /^gpg:\s(?:$gpg_WARNING|$gpg_Warning|$gpg_bad|$gpg_Cantcheck|$gpg_expired)/o)
+ if (index($$L[$X], "gpg: $gpg_WARNING")==0 ||
+ index($$L[$X], "gpg: $gpg_Warning")==0 ||
+ index($$L[$X], "gpg: $gpg_bad")==0 ||
+ index($$L[$X], "gpg: $gpg_Cantcheck")==0 ||
+ index($$L[$X], "gpg: $gpg_expired")==0 ||
+ index($$L[$X], "gpg: $gpg_bug")==0)
{ return 0; }
- if ($$L[$X] =~ /^gpg:\s$gpg_bug/o)
- { return 0; }
- if ($$L[$X] =~ /^gpg:\s$gpg_good/o)
+ if (index($$L[$X], "gpg: $gpg_good")==0)
{ $ok = 1; }
$X++;
}
for (my $x=0; $x<scalar(@$L); $x++) {
if ($$V[$x]) { next; }
- if ($$L[$x]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o)
+ if ($$L[$x]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o)
{
my $from;
for (my $m=0; $m<scalar(@$H); $m++) {
- if ($$H[$m] =~ /^From:/) {
+ if (index($$H[$m], 'From:')==0) {
$from = $$H[$m];
$m++;
- while ($$H[$m] =~ /^\s/) { $from .= $$H[$m]; $m++; }
+ while (exists($$H[$m]) && $$H[$m] =~ /^\s/)
+ { $from .= $$H[$m]; $m++; }
last;
}
}
- ($from) = $from=~m/([a-z\d][a-z_\d\+-\.]*\@(?:[a-z_\d\+-\.]+\.)+[a-z]{2,})/i;
- esc(\$from);
+ ($from) = $from=~m/(\w[\w.+-]*@(?:[\w.+-]+\.)+[A-Za-z]{2,})/;
my $uid = 1;
for (my $i=$x+1; $i<scalar(@$L); $i++) {
- if ($pgpshort && $$L[$i] =~ /^gpg:\s$gpg_aka/o) { $uid++; }
+ if ($pgpshort && index($$L[$i], "gpg: $gpg_aka")==0)
+ { $uid++; }
if ($pgpshort && $uid>1 &&
- $$L[$i] =~ /^gpg:\s$gpg_aka/o && $$L[$i] !~ /$from/)
+ index($$L[$i], "gpg: $gpg_aka")==0 &&
+ index($$L[$i], $from)<0)
{
splice(@$L, $i, 1);
splice(@$V, $i, 1);
$i--;
}
- elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:$mutt_pgpoutend)/o)
+ elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutend\E)/o)
{
if ($pgpmove ||
($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i)))
}
}
elsif ($tmp &&
- $$L[$x]=~/^(?:\e.+?\a)?(?:$mutt_pgpencrypted|$mutt_pgpclearsigned|$mutt_pgpsigned)/o)
+ $$L[$x] =~ /^
+ (?:\e[^\a]+\a)?
+ (?:\Q$mutt_pgpencrypted\E |
+ \Q$mutt_pgpclearsigned\E|
+ \Q$mutt_pgpsigned\E)
+ /ox)
{
splice(@$L, $x+1, 0, @{$tmp[$tmp]});
for (my $i=$x; $i<scalar(@{$tmp[$tmp]}); $i++) {
my (@ads, @hdr, @bo1, @bo2, @ftr, @sig, @vrb, @att) =
((), (), (), (), (), (), (), (), ());
- # First, remove and store lines we might need later...
+ # Remove and store lines we might need later...
# Remove headers:
- for ($x=0; $x<$#$lines; $x++) { if (@$lines[$x] =~ /^$/) { last; }; }
- @hdr = @$lines[0..$x];
- splice(@$lines, 0, $x+1);
+ if (!$nohdr) {
+ for ($x=0; $x<$#$lines; $x++) { if (@$lines[$x] =~ /^$/) { last; }; }
+ @hdr = @$lines[0..$x];
+ splice(@$lines, 0, $x+1);
+ }
# remember the original body lines count
my $linecount = scalar(@$lines);
+ # Remove ML footers:
+ remove_footers($lines, \@ftr, $footers, undef, $ftr_ml);
+
+ # Remove ad footers:
+ remove_footers($lines, \@ads, $ads, undef, $ftr_ad);
# See if we have a multipart content type. If yes, see if it is already
- # ripped (e.g. by mutt(1)), otherwise only leave the first part if it
- # is plain text (if not, we are done - non-text messages are not our
- # business).
+ # ripped (e.g. by you MUA, assuming it does not get special treatment with
+ # --mua=foo), otherwise only leave the first part if it is plain text (if
+ # not, we are done - non-text messages are not our business).
if ($mua ne 'mutt') {
for ($x=0; $x<scalar(@hdr); $x++) {
- if ($hdr[$x] =~ /^Content-Type:\s+(.*)$/i) {
+ if ($hdr[$x] =~ /^Content-[Tt]ype:\s+(.*)$/) {
my $foo = $1;
- if ($foo =~ /^multipart\//i) {
+ if ($foo =~ m!^multipart/!) {
undef $foo;
if ($hdr[$x] =~ /\Wboundary="([^"]+)"/i) { $foo = $1; }
my $bar = 'text/plain';
for ($x++; $x<@$lines && $$lines[$x]!~/^$/; $x++)
{
- if ($$lines[$x] =~ /^Content-Type:\s+(.*)/i) {
+ if ($$lines[$x] =~ /^Content-[Tt]ype:\s+(.*)/) {
$bar = $1;
}
}
if ($x>=scalar(@$lines)) { exit(EX_DATAERR); }
- if ($bar =~ /^text\/plain/i) {
+ if ($bar =~ m!^text/plain!) {
my $z;
for ($z=1; $x+$z<@$lines; $z++) {
if (index($$lines[$x+$z], '--'.$foo)==0) {
}
@bo1 = @$lines[0..$x];
splice(@$lines, 0, $x+1);
+
+ # remove mailing list and ad footers within this
+ # attachment:
+ remove_footers($lines, \@ftr, $footers, undef, $ftr_ml);
+ remove_footers($lines, \@ads, $ads, undef, $ftr_ad);
+
last;
}
else {
for ($x=0; $x<scalar(@$lines); $x++) {
if (!$vrb[$x]) {
$z++;
- if ($$lines[$x] =~ /^$indent/) { $y++; }
+ if (index($$lines[$x], $indent)==0) { $y++; }
}
}
- $y = $y/$z;
- if ($y>=$check_ratio) {
+ if ($y/$z>=$check_ratio) {
print $msg_ratio;
exit EX_UNAVAILABLE;
}
}
- # Remove ML footers:
- remove_footers($lines, \@ftr, $footers, undef, $ftr_ml);
-
- # Remove ad footers:
- remove_footers($lines, \@ads, $ads, undef, $ftr_ad);
-
if ($mua eq 'mutt') {
# See if we find pgp output generated by mutt before we scramble
# the thing. If yes, see if we can beautify it.
if ($vrb[$x]) { next; }
# The following regexp's are quite ugly because for most users
# these lines are coloured using termcap... (bah!)
- if (($$lines[$x] =~ /^(?:\e.+?\a)?$mutt_attachment(\d+)(?::.*)? \-\-\]/o &&
+ if (($$lines[$x] =~
+ /^(?:\e[^\a]+\a)?\Q$mutt_attachment\E(\d+)/o &&
(($1 ne '1') ||
($x<$#$lines &&
- $$lines[$x+1] !~ /^(?:\e.+?\a)?(?:$mutt_contenttype)(?:text\/plain|application\/pgp)/io))) ||
- ($$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpsigned|$mutt_pgpclearsigned|$mutt_pgpencrypted)/o))
+ $$lines[$x+1] !~ m!^
+ (?:\e[^\a]+\a)?
+ (?:\Q$mutt_contenttype\E)
+ (?:text/plain|application/pgp)
+ !ox))) ||
+ ($$lines[$x] =~ /^
+ (?:\e[^\a]+\a)?
+ (?:\Q$mutt_pgpsigned\E |
+ \Q$mutt_pgpclearsigned\E|
+ \Q$mutt_pgpencrypted\E)
+ /ox))
{
# Strip attachments to prepare further processing
unshift(@att, @$lines[$x..$#$lines]);
splice(@$lines, $x);
# Try to fix trailing empty lines
- while (scalar(@$lines) && $$lines[$#$lines] =~ /^(?:\e.+?\a)?\s*$/) {
+ while (scalar(@$lines) && $$lines[$#$lines] =~
+ /^(?:\e[^\a]+\a)?\s*$/) {
unshift(@att, pop(@$lines));
}
# situations.
# The following regexp is quite ugly because for most
# users the line is coloured using termcap... (bah!)
- if ($att[$x]=~/^(?:\e.+?\a)?$mutt_attachment\d+.* --\]/o &&
- $att[$x+1] =~ /^(?:\e.+?\a)?(?:$mutt_contenttype)message\/rfc822/o)
+ if ($att[$x] =~
+ /^(?:\e[^\a]+\a)?\Q$mutt_attachment\E\d+/o &&
+ $att[$x+1] =~ m!^
+ (?:\e[^\a]+\a)?
+ (?:\Q$mutt_contenttype\E) (?:message/rfc822|multipart/alternative)
+ !ox)
{
$x += 2;
while ($att[$x] !~ /^\s*$/) { $x++; }
# Remove signature:
if (scalar(@$lines)) {
my $sn = 0;
+ my $chk_empty = 1;
+ my $empty = 0;
+
for ($x = $#$lines; $x>=0; $x--) {
- if ((!$vrb[$x]) && $$lines[$x] =~ /^-- $/) {
- if ($diff) {
- for (my $i=1; $x+$i+1<scalar(@$lines); $i++) {
- if ($$lines[$x+$i] =~ /^\-\-\-\s+\S/ &&
- $$lines[$x+$i+1] =~ /^\+\+\+\s+\S/)
- {
- $sig = 0;
- unshift(@sig, @$lines[$x..$#$lines]);
- splice(@$lines, $x);
- last;
+ if (!$vrb[$x]) {
+ if ($$lines[$x] =~ /^-- $/) {
+ if ($diff) {
+ for (my $i=1; $x+$i+1<scalar(@$lines); $i++) {
+ if ($$lines[$x+$i] =~ /^-{3}\s+\S/ &&
+ $$lines[$x+$i+1] =~ /^\+{3}\s+\S/)
+ {
+ $sig = 0;
+ unshift(@sig, @$lines[$x..$#$lines]);
+ splice(@$lines, $x);
+ last;
+ }
+ }
+ if (scalar(@sig)) {
+ if (defined($sign) && ++$sn==$sign) { last; } else { next; }
}
}
- if (scalar(@sig)) {
- if (defined($sign) && ++$sn==$sign) { last; } else { next; }
- }
- }
- if ($sig || ($lsig && ($#$lines-$x>$lsig))) {
- if ($lsig && !$sig) {
- unshift(@sig, "[---=| Overlong signature removed by $0: " .
- (scalar(@$lines)-$x) . " lines snipped |=---]\n");
+ if ($sig || ($lsig && ($#$lines-$x-$empty>$lsig))) {
+ if ($lsig && !$sig) {
+ unshift(@sig, "[---=| Overlong signature removed by $0: " .
+ (scalar(@$lines)-$x) . " lines snipped |=---]\n");
+ }
+ splice(@$lines, $x);
}
- splice(@$lines, $x);
- }
- else {
- unshift(@sig, @$lines[$x..$#$lines]);
- splice(@$lines, $x);
+ else {
+ unshift(@sig, @$lines[$x..$#$lines]);
+ splice(@$lines, $x);
+ }
+ if (defined($sign) && ++$sn==$sign) { last; } else { next; }
}
- if (defined($sign) && ++$sn==$sign) { last; } else { next; }
+ # any trailing newlines?
+ elsif ($chk_empty && $$lines[$x] =~ /^\s*$/) { $empty++; }
+ elsif ($chk_empty) { $chk_empty = 0; }
}
}
}
if ($kamm) { decomb($lines, \@vrb); }
# Now care about TOFU.
- # One common mispractice is M$ style TOFU:
- if ($ms) {
+ # One common mispractice is M$ and Groupwise style TOFU:
+ if ($ms||$gw) {
# bloat this array if you want more internationalization:
my @tofu = ('Original Message',
+ 'Original-Nachricht',
'Ursprüngliche Nachricht',
+ 'Ursprüngliche Nachricht',
'Ursprungliche Nachricht',
'Mensagem original',
'Ursprungligt meddelande',
DONE: for ($x=0; $x<scalar(@$lines); $x++) {
if (!$vrb[$x]) {
foreach my $tmp (@tofu) {
- if ($$lines[$x] =~ /^-+\s?$tmp\s?-+/) {
+ if (($ms && $$lines[$x] =~ /^\s?-+\s?$tmp\s?-+/) ||
+ ($gw &&
+ ($$lines[$x] =~ /^>>>[^\<]+<[^\>]+> \d\d?\/\d\d?\/\d\d? \d\d?:\d\d [AP]M >>>/ ||
+ $$lines[$x] =~ /^>>> On [A-Z][a-z][a-z]?, [A-Z][a-z][a-z]? \d\d?, \d\d\d\d at [ \d]\d:\d\d [AP]M, in message/))) {
$x++;
$trad = 0;
$bigqn = 0;
if ((!$k) && $$lines[$x] !~ /^\s*$/o &&
((!$mua) ||
($mua eq 'mutt' &&
- $$lines[$x] !~ /^(?:\e.+?\a)?(?:$mutt_attachment)/o &&
- $$lines[$x] !~ /^(?:\e.+?\a)?(?:$mutt_contenttype)/o)) &&
- ((!$spass) || $$lines[$x]!~/^$spass_prefix/o))
+ $$lines[$x] !~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_attachment\E)/o &&
+ $$lines[$x] !~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_contenttype\E)/o)) &&
+ ((!$spass) || index($$lines[$x], $spass_prefix)!=0))
{
if ($mua eq 'mutt' && (!$tmp) &&
- $$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpoutstart)/o) {
+ $$lines[$x] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o) {
$tmp = 1;
} elsif ($mua eq 'mutt' && $tmp &&
- ($$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_beginsigned)/o ||
- $$lines[$x] =~ /^(?:\e.+?\a)?(?:$mutt_pgpclearsigstart)/o)) {
+ ($$lines[$x] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_beginsigned\E)/o ||
+ $$lines[$x] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpclearsigstart\E)/o)) {
$tmp = 0;
} elsif (!$tmp) {
$k = 1;
my $p = 0; # levels of pgp signed parts
for (my $i=$x+1; $i<scalar(@$lines); $i++) {
- if ($$lines[$i] =~ /^(?:\e.+?\a)?(?:$mutt_pgpclearsigstart)/o) {
+ if ($$lines[$i] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpclearsigstart\E)/o) {
$p++;
}
}
if ($p) {
STAIRS: for (my $i=0; $i<scalar(@att); $i++) {
- if ($p==0 && $att[$i] =~ /^(?:\e.+?\a)?\[\-\-\ /o) {
+ if ($p==0 && $att[$i] =~ /^(?:\e[^\a]+\a)?\[-- /o) {
splice(@att, 0, $i);
unshift(@att, "\n");
goto CLEAN;
- } elsif ($att[$i] =~ /^(?:\e.+?\a)?(?:$mutt_pgpclearsigned)/o) {
+ } elsif ($att[$i] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpclearsigned\E)/o) {
splice(@att, 0, $i+1);
$p--;
goto STAIRS;
# Care for punctuation abuse:
if ($elli) {
for ($x=0; $x<scalar(@$lines); $x++) {
- if (!$vrb[$x]) { $$lines[$x] =~ s/(([.?!])\2\2)\2+/$1/eg; }
+ if (!$vrb[$x]) { $$lines[$x] =~ s/(([.?!])\2\2)\2+/$1/g; }
}
}
# environment
-my $locale = $ENV{'LC_ALL'}?$ENV{'LC_ALL'}:($ENV{'LC_MESSAGES'}?$ENV{'LC_MESSAGES'}:$ENV{'LANG'});
+my $locale = $ENV{'LC_ALL'}?$ENV{'LC_ALL'}:
+ ($ENV{'LC_MESSAGES'}?$ENV{'LC_MESSAGES'}:$ENV{'LANG'});
# command line switches
($ad, $ads, $bigqn, $bigqx, $check, $cr, $sysl, $diff, $elli, $footers, $lax,
- $ml, $ms, $ms_smart, $mda, $mua, $hdrs, $kamm, $lsig, $sig, $sigint,
- $spass, $trad, $trsp) =
- (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ $ml, $gw, $ms, $ms_smart, $mda, $mua, $hdrs, $kamm, $lsig, $nohdr, $sig,
+ $sigint, $spass, $trad, $trsp) =
+ (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
my $ifile = '-'; # use STDIN if nothing specified
# get command line params:
Getopt::Mixed::init('a A=s c d e h i=s k L=s l m M=s o=s P=s p:s r S:i'.
- ' s t v w bigq:s check:s debug>d diff ftr-ad ftr-ml help>h kminl=i'.
- ' kmaxl=i kdiff=i lax-security locale=s ms-smart mua>M pgp-short'.
- ' pgp-move pgp-move-vrf sigsmax:i spass version>v');
+ ' s t v w bigq:s body check:s debug>d diff ftr-ad ftr-ml groupwise'.
+ ' help>h kminl=i kmaxl=i kdiff=i lax-security locale=s max-lines=i'.
+ ' ms-smart mua>M pgp-short pgp-move pgp-move-vrf sigsmax:i spass'.
+ ' version>v');
while (my ($opt, $val, $pretty) = nextOption()) {
if ($opt eq 'a') { $ad = 1; }
elsif ($opt eq 'A') { $ads = $val; }
$bigqx = $2?$2:10;
if ($bigqn<=0 || $bigqx<=0 || $bigqn<=$bigqx) { help(); }
}
+ elsif ($opt eq 'body') { $nohdr = 1; $hdrs = 1; }
elsif ($opt eq 'c') { $cr = 1; }
elsif ($opt eq 'check') {
$check = 1;
- while ($val && $val =~ s/^([^,\s]+)(?:,(\S+))?$/$2/) {
+ while ($val && $val =~ /^([^,\s]+)(?:,(\S+))?$/) {
my $foo = $1;
+ $val = $2;
- if ($foo =~ /^ratio=(0?\.\d+)$/) {
- $check_ratio = $1?$1:1;
+ if ($foo =~ /^ratio(?:=(0?\.\d+))?$/) {
+ $check_ratio = $1?$1:0.75;
}
}
}
elsif ($opt eq 'e') { $elli = 1; }
elsif ($opt eq 'ftr-ad') { $ftr_ad = 1; $ad = 1; }
elsif ($opt eq 'ftr-ml') { $ftr_ml = 1; $ml = 1; }
+ elsif ($opt eq 'groupwise') { $gw = 1; }
elsif ($opt eq 'i') { $ifile = $val; }
elsif ($opt eq 'k') { $kamm = 1; }
elsif ($opt eq 'kminl') { $kminl = $val; $kamm = 1; }
elsif ($opt eq 'lax-security') { $lax = 1; }
elsif ($opt eq 'locale') { $locale = $val; }
elsif ($opt eq 'm') { $ms = 1; }
+ elsif ($opt eq 'max-lines') { $maxlines = $val; }
elsif ($opt eq 'ms-smart') { $ms_smart = 1; $ms = 1; }
elsif ($opt eq 'M') {
$mua = lc($val);
Getopt::Mixed::cleanup();
if (($ml && $footers eq '')|| # no -l without -L
($ad && $ads eq '')|| # no -a without -A
+ ($nohdr && $pgpshort)|| # --body and --pgp-short are like oil and water
($ifile eq '')|| # no empty -i
($ofile eq '')) # no empty -o
{ help(); }
if ($mua eq 'mutt') {
if (defined $locale && $locale ne '' && $locale ne 'C' && $locale ne 'POSIX') {
- foreach my $key (keys %mutt_attachment) {
- if ($locale =~ /^$key/) {
- if ($mutt_attachment{$key})
- { $mutt_attachment = $mutt_attachment{$key}; }
- if ($mutt_contenttype{$key})
- { $mutt_contenttype = $mutt_contenttype{$key}; }
- if ($mutt_pgpsigned{$key})
- { $mutt_pgpsigned = $mutt_pgpsigned{$key}; }
- if ($mutt_beginsigned{$key})
- { $mutt_beginsigned = $mutt_beginsigned{$key}; }
- if ($mutt_pgpclearsigned{$key})
- { $mutt_pgpclearsigned = $mutt_pgpclearsigned{$key}; }
- if ($mutt_pgpclearsigstart{$key})
- { $mutt_pgpclearsigstart = $mutt_pgpclearsigstart{$key}; }
- if ($mutt_pgpencrypted{$key})
- { $mutt_pgpencrypted = $mutt_pgpencrypted{$key}; }
- if ($mutt_pgpoutstart{$key})
- { $mutt_pgpoutstart = $mutt_pgpoutstart{$key}; }
- if ($mutt_pgpoutend{$key})
- { $mutt_pgpoutend = $mutt_pgpoutend{$key}; }
- last;
- }
- }
- foreach my $key (keys %gpg_WARNING) {
- if ($locale =~ /^$key/) {
- if ($gpg_WARNING{$key})
- { $gpg_WARNING = $gpg_WARNING{$key}; }
- if ($gpg_Warning{$key})
- { $gpg_Warning = $gpg_Warning{$key}; }
- if ($gpg_Cantcheck{$key})
- { $gpg_Cantcheck = $gpg_Cantcheck{$key}; }
- if ($gpg_aka{$key})
- { $gpg_aka = $gpg_aka{$key}; }
- if ($gpg_bad{$key})
- { $gpg_bad = $gpg_bad{$key}; }
- if ($gpg_expired{$key})
- { $gpg_expired = $gpg_expired{$key}; }
- if ($gpg_good{$key})
- { $gpg_good = $gpg_good{$key}; }
- last;
- }
+ eval { require Locale::gettext; };
+ if ($@) { warn $@; exit(EX_SOFTWARE); } else {
+ Locale::gettext::textdomain('mutt');
+ ($mutt_attachment) =
+ Locale::gettext::gettext("[-- Attachment #%d") =~
+ m/^([^%]*)/;
+ ($mutt_contenttype) =
+ Locale::gettext::gettext("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n") =~
+ m/^([^%]*)/;
+ ($mutt_pgpsigned) =
+ Locale::gettext::gettext("[-- End of signed data --]\n") =~
+ m/^(.*)\n/m;
+ ($mutt_beginsigned) =
+ Locale::gettext::gettext("[-- The following data is signed --]\n\n") =~
+ m/^(.*)\n/m;
+ ($mutt_pgpclearsigned) =
+ Locale::gettext::gettext("[-- END PGP SIGNED MESSAGE --]\n") =~
+ m/^(.*)\n/m;
+ ($mutt_pgpclearsigstart) =
+ Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n") =~
+ m/^(.*)\n/m;
+ ($mutt_pgpencrypted) =
+ Locale::gettext::gettext("[-- End of PGP/MIME encrypted data --]\n") =~
+ m/^(.*)\n/m;
+ ($mutt_pgpoutstart) =
+ Locale::gettext::gettext("[-- PGP output follows (current time: %c) --]\n") =~
+ m/^([^%]*)/;
+ ($mutt_pgpoutend) =
+ Locale::gettext::gettext("[-- End of PGP output --]\n") =~
+ m/^(.*)\n/m;
+
+ Locale::gettext::textdomain('gnupg');
+ ($gpg_WARNING) =
+ Locale::gettext::gettext("WARNING: using insecure random number generator!!\n") =~
+ m/^([^:]*: )/;
+ ($gpg_Warning) =
+ Locale::gettext::gettext("WARNING: message was encrypted with a weak key in the symmetric cipher.\n") =~
+ m/^([^:]*: )/;
+ ($gpg_Cantcheck) =
+ Locale::gettext::gettext("Can't check signature: %s\n") =~
+ m/^([^%]*)/;
+ ($gpg_aka) =
+ Locale::gettext::gettext((' 'x16).'aka "%s"') =~
+ m/^([^"«%]*)["«%]/;
+ ($gpg_bad) =
+ Locale::gettext::gettext('BAD signature from "%s"') =~
+ m/^([^"«%]*)["«%]/;
+ ($gpg_expired) =
+ Locale::gettext::gettext("Note: This key has expired!\n") =~
+ m/^(.*)\n/m;
+ ($gpg_good) =
+ Locale::gettext::gettext('Good signature from "%s"') =~
+ m/^(([^"«%]*))["«%]/;
+ ($gpg_bug) =
+ Locale::gettext::gettext("... this is a bug (%s:%d:%s)\n") =~
+ m/^([^%]*)/;
}
}
- esc(\$mutt_attachment);
- esc(\$mutt_contenttype);
- esc(\$mutt_pgpsigned);
- esc(\$mutt_beginsigned);
- esc(\$mutt_pgpclearsigned);
- esc(\$mutt_pgpclearsigstart);
- esc(\$mutt_pgpencrypted);
- esc(\$mutt_pgpoutstart);
- esc(\$mutt_pgpoutend);
-
- esc(\$gpg_WARNING);
- esc(\$gpg_Warning);
- esc(\$gpg_Cantcheck);
- esc(\$gpg_aka);
- esc(\$gpg_bad);
- esc(\$gpg_expired);
- esc(\$gpg_good);
- esc(\$gpg_bug);
}
else {
if ($ms_smart || $pgpshort || $pgpmove || $pgpmovevrf) { help(); }
}
-esc(\$spass_prefix);
-
# Read message:
-if (!open(IN, $ifile)) { print STDERR "Could not open $ifile: $!\n"; exit(EX_IOERR); }
+if (!open(IN, $ifile))
+ { print STDERR "Could not open $ifile: $!\n"; exit(EX_IOERR); }
my @message = <IN>;
close IN;
+# First, check msg length and stop processing if msg is too long:
+if ((defined $maxlines) && (@message > $maxlines)) {
+ if ($ofile ne 'NONE') {
+ write_msg(($mda?'|'.SENDMAIL." $mda":">$ofile"), \@message);
+ }
+ exit(EX_DATAERR);
+}
+
# this should be self-explanatory:
process_msg(\@message);
projects / pkg / t-prot.git / blobdiff