From: ak1 Date: Tue, 1 Feb 2005 13:10:54 +0000 (+0000) Subject: Andreas Krennmair: X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=3d937534e7b1ee723f86594b5e4c64c95158a933 Andreas Krennmair: warning, HUGE diff: I merged the 1.5.6 -> 1.5.7 changes into mutt-ng. Report problems if you encounter any. git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@42 e385b8ad-14ed-0310-8656-cc95a2468c6d --- diff --git a/ChangeLog b/ChangeLog index 1423066..00a8ecb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,703 @@ +2005-01-27 20:52:13 Thomas Roessler (roessler) + + * main.c: Add USE_INODESORT to main.c's option dump. + +2005-01-27 20:38:02 TAKAHASHI Tamotsu (roessler) + + * commands.c: 0. In compose mode, press Ctrl-t to change + Content-Type. 1. Type "application/octet-stream" for example. + 2. Press Ctrl-t again. 3. Type "text/plain; charset=us-ascii" + 4. You will be asked "Convert to us-ascii upon sending?" + 5. Press y or n. 6. You will see a strange message: + "Content-Type changed to Convert to us-ascii upon sending?." + +2005-01-27 20:26:52 Thomas Roessler (roessler) + + * pgp.c: Return an error in pgp_decrypt_part when the PGP output + file is empty. + +2005-01-27 20:17:46 Thomas Glanzmann (roessler) + + * curs_main.c: this patch doesn't raise an error if you try + to sync an empty mailbox which makes it possible to use such a + macro as this on an empty mailbox: + + macro index y "?" macro pager y + "?" + +2005-01-27 19:34:50 David Shaw (roessler) + + * pgp.c: Detect end of PGP armor header when a line is + whitespace-only. + +2005-01-27 19:18:15 Thomas Roessler (roessler) + + * smime.c: Void the S/MIME passphrase before prompting + the user to re-enter it. Noted by TAKAHASHI Tamotsu + , but with memset replaced by + smime_void_passphrase(). + +2005-01-27 19:00:59 TAKAHASHI Tamotsu (roessler) + + * curs_lib.c: Add terminal newline when it lacks after editing + a message. Originally from TAKIZAWA Takashi. + +2005-01-27 18:58:14 Thomas Roessler (roessler) + + * Makefile.am: Include mutt_ssl_gnutls.c with the distribution. + +2005-01-27 18:54:24 Marco d'Itri (roessler) + + * globals.h, imap/imap.c, imap/util.c, init.c, init.h, main.c, + mutt.h, mutt_sasl.c, mutt_socket.c, mutt_ssl.h, mutt_ssl_gnutls.c, + pop_lib.c: GNUTLS support. Used in Debian since Nov. 2001. + +2005-01-27 18:48:41 Bill Nottingham (roessler) + + * mutt_sasl.c: With SASL, expect the server to prompt for + additional auth data if we have some to send (#129961, upstream + #1845) + + * contrib/sample.muttrc: Changes the sample.muttrc highlight to + catch https URLs as well. + + * color.c, main.c: Support for the "default" color in Slang. + +2005-01-27 18:45:37 Florian Weimer (roessler) + + * mh.c, configure.in: Read files in maildir folders in inode + order; this seems to reduce seek overhead on Linux. Enabled by + default; to disable, run configure with --disable-inodesort. + (By way of Marco d'Itri.) + +2005-01-27 18:28:42 Marco d'Itri (roessler) + + * pgp.c: Improved good signature check. + + * contrib/gpg.rc, pgpinvoke.c: Make the default Muttrc work + out the box for people using gnupg-agent. Wrote and applied a + one-line patch to make the %?p? conditional escape work correctly, + patch forwarded upstream. (Closes: #277646) + + * pgpewrap.c: Don't segfault when invoked without any arguments. + + * contrib/gpg.rc, pgp.c: Evaluate gpg's machine-parseable status + messages. + + * smime_keys.pl: Add some sanity checks to smime_keys.pl. + + * contrib/gpg.rc: A gpg command line contains both --verbose + and --no-verbose, remove the first. + +2005-01-26 14:33:08 Thomas Roessler (roessler) + + * status.c: And, thinking about it further, this should just be + an empty string, not "(null)". + + * status.c: The last Context->pattern fix was still crap. + Ooooops. (Thanks Ralf.) + +2005-01-26 13:36:44 Thomas Glanzmann (roessler) + + * Makefile.am, configure.in, globals.h, hcache.c, imap/imap.c, + imap/imap_private.h, imap/message.c, init.h, main.c, protos.h: + IMAP header cache. + +2005-01-26 12:37:38 Ralf Wildenhues (roessler) + + * addrbook.c, browser.c, commands.c, compose.c, imap/utf7.c: + Make some functions static. + +2005-01-26 12:36:36 Ralf Wildenhues (roessler) + + * imap/command.c, imap/message.c: Fix some printf arguments. + +2005-01-26 12:21:46 Thomas Roessler (roessler) + + * status.c: Really fix it. Thanks to Ralf for noting the + typo in my earlier commit. + + * status.c: A variant of + . + Spotted by Ralf Wildenhues . + +2005-01-17 02:24:49 Brendan Cully (brendan) + + * cvslog2changelog.pl: cvs log emits a timezone after the + hour, at least here. Adjust date regexp to handle that case. + +2005-01-15 09:52:44 Adeodato Simó (brendan) + + * po/cs.po: Major translation updates forgotten in mutt-po. + +2005-01-15 08:01:35 Brendan Cully (brendan) + + * Makefile.am: Update commit targets to work when + builddir != srcdir. + +2005-01-15 07:36:37 Adeodato Simó (brendan) + + * init.h: Document the interaction between $reverse_name and + the alternates. Debian #210679. + + * doc/manual.sgml.head, doc/muttrc.man.head: Include reply-hook + in the reference section of the manual. + Debian 254294. + + * doc/mutt.man: Small typo in the mutt.1 manpage: Qeury -> Query. + Debian #258621. + + * doc/muttrc.man.head: Minor formatting issue in the muttrc.5 + manpage. + Debian #272579. + + * po/ca.po, po/sv.po: Minor corrections in these translations, + checked with their authors. + + * po/de.po, po/it.po: Major translation updates forgotten in + mutt-po. + +2005-01-11 12:15:13 Thomas Roessler (roessler) + + * doc/manual.sgml.head, doc/muttrc.man.head: Document send2-hook. + + * send.c: send2-hook should also be executed after the first + time the message is edited by the user. + +2005-01-09 15:35:51 Thomas Roessler (roessler) + + * doc/muttbug.man, muttbug.sh.in: Replace muttbug and its + documentation by a note that acknowledges the shut down of the + bug tracking system. + +2004-12-21 09:46:24 Thomas Roessler (roessler) + + * pgp.c: Fix Debian #275188. + +2004-12-07 19:50:04 Thomas Roessler (roessler) + + * compose.c, hook.c, init.c, init.h, mutt.h, send.c: Add + send2-hook and fix alternates handling. + +2004-11-19 16:16:51 René Clerc (roessler) + + * doc/manual.sgml.tail, doc/manual.sgml.head: Document + tag-prefix-cond. + +2004-11-08 08:43:17 Ralf Wildenhues (roessler) + + * imap/imap_private.h: Having a signed one-bit bitfield is quite + odd -- its value is either 0 or -1. Although the current code + is not broken because it doesn't test equality to 1, IMHO it's + better not to use that. + + * imap/message.c: There's a size_t in imap_append_message not + printed out portably. + +2004-11-02 13:30:58 Thomas Roessler (roessler) + + * copy.h: Fix flag confusion. Noted by Vincent Lefevre. + +2004-10-30 21:59:00 Thomas Roessler (roessler) + + * browser.c, buffy.c, check_sec.sh, commands.c, edit.c, + imap/auth_cram.c, imap/auth_gss.c, imap/imap.c, imap/message.c, + lib.c, lib.h, mutt_ssl.c, muttlib.c, recvcmd.c, url.c: + safe_strcat, safe_strncat. Thanks to Ulf H. for noting the + wrong use of strncat in part of the mutt code base. + + * smime.c: Fix bad code in smime_get_field_from_db. Problem noted + by Ulf Härnhammar . + +2004-09-29 11:27:33 Thomas Roessler (roessler) + + * lib.c: Fix mutt_unlink race condition for systems without + O_NOFOLLOW. Noted by Jarno Huuskonen . + +2004-09-07 08:09:39 Matthias Andree (roessler) + + * prepare: Fix parameter passing. + +2004-08-31 15:41:03 Thomas Roessler (roessler) + + * configure.in: Add AC_GNU_SOURCE. + + * recvattach.c: Remove *two* layers of S/MIME from messages + before building the attachment tree. A generic solution would + remove intransparent encodings all the way down the tree. + +2004-08-30 20:10:10 Moritz Schulte (roessler) + + * compose.c: Only print additional information related to PGP + in case the current message is indeed to be encrypted/signed + with PGP. + + (This change is misattributed to Brendan Cully in the CVS.) + +2004-08-30 20:05:40 Brendan Cully (roessler) + + * globals.h, init.h, mutt_sasl.c, mutt_ssl.c: Here's a patch + to allow mutt to use SSL client certificates to authenticate + itself. To use, set ssl_client_cert to the path to your + certificate file (containing both the certificate and the private + key). It works with the SASL EXTERNAL authentication mechanism, + so you'll need to have SASL enabled as well. + +2004-08-30 20:03:35 Thomas Glanzmann (roessler) + + * init.c: Fix a memory leak in the generic spam detection code. + + * muttlib.c, protos.h: This wipes duplicated code, which I + introduced a while ago. + +2004-08-30 19:47:47 TAKAHASHI Tamotsu (roessler) + + * po/ja.po: update + +2004-08-21 07:35:16 Ivan Vilata i Balaguer (roessler) + + * po/ca.po: update + +2004-08-17 16:06:48 René Clerc (roessler) + + * po/nl.po: update + +2004-08-17 15:56:23 Thomas Roessler (roessler) + + * configure.in: Check for ssize_t, really. + + * configure.in: Check for ssize_t. + +2004-08-17 15:25:31 Ronny Haryanto (roessler) + + * po/id.po: Corrected update. + + * po/id.po: update + +2004-08-17 15:22:25 Vincent Lefevre (roessler) + + * po/fr.po: update + +2004-08-17 13:42:01 Johan Svedberg (roessler) + + * po/sv.po: update + +2004-08-16 21:37:43 Adeodato Simó (roessler) + + * headers.c: as of current cvs, setting "PGP: E" (or similar) + when header-editing a message does not work. the OP is set + (ENCRYPT, SIGN, whatever) but APPLICATION_PGP is missing. + +2004-08-16 21:36:38 Brendan Cully (roessler) + + * imap/imap.c: If STARTTLS fails to complete the SSL handshake, + the error is not propagated and mutt will attempt to log in + anyway, probably causing an infinite block on read. The attached + patch closes the socket in this case, and propagates the error + properly. + + * imap/auth_sasl.c: The attached patch causes mutt to attempt + the next method in imap_authenticators if the previous method + failed, even if the server reported that the method was + available. Previously mutt would give up if any authentication + method failed. + +2004-08-16 21:34:22 Moritz Schulte (roessler) + + * compose.c: Only print "Encrypt with" field in case the used + S/MIME modules supports this feature. + +2004-08-16 21:33:35 Pawel Dziekonski (roessler) + + * po/pl.po: update + +2004-08-11 12:31:21 Thomas Glanzmann (roessler) + + * imap/imap.c: Fix two IMAP memory leaks. + + * imap/imap.c, imap/imap.h: Remove imap_close_connection. + + * menu.c: Fix a memory leak in mutt_menuDestroy. + +2004-08-08 16:20:37 Thomas Glanzmann (roessler) + + * muttlib.c, protos.h: Fix a memory leak. + +2004-08-08 16:19:15 Thomas Roessler (roessler) + + * pgp.c, smime.c: Fix the PGP and S/MIME menus. Complaints + and suggestions of many lead to these changes. See mutt-dev + discussions around this time for details. + + * Makefile.am, crypthash.h, md5.h, sha1.h: Fix uint32_t + portability problem. Reported by Steve Kennedy. + +2004-08-07 05:23:33 Johan Svedberg (roessler) + + * po/sv.po: update + +2004-08-02 08:03:46 Nathan Dushman (roessler) + + * imap/command.c: Fix the improvement to address #1655. + +2004-07-22 01:10:55 Brendan Cully (roessler) + + * imap/message.c: Quick fix for IMAP breakage. + +2004-07-21 22:15:40 Nathan Dushman (roessler) + + * imap/command.c: This is a one-line patch that increases the + speed at which mutt opens IMAP mailboxes, and addresses bug #1655. + +2004-07-20 09:00:50 Pawel Dziekonski (roessler) + + * po/pl.po: update + +2004-07-20 08:17:21 Thomas Roessler (roessler) + + * imap/message.c, mutt.h, parse.c, send.c, url.c: Use List-Post + headers when doing list-reply. + +2004-07-19 21:44:23 TAKAHASHI Tamotsu (roessler) + + * globals.h, imap/message.c, init.h: Fix #1548. (The first + variant, with $imap_headers specifying headers that are downloaded + in addition to the set required for mutt to work properly.) + +2004-07-19 21:41:43 David Champion (roessler) + + * mbox.c, mh.c, pgp.c, sendlib.c: Fix some compiler warnings. + +2004-07-19 21:39:28 Adeodato Simó (roessler) + + * doc/manual.sgml.head: Fixing a missing newline. + +2004-07-19 21:36:46 Thomas Glanzmann (roessler) + + * Makefile.am: Fix IMAP breakage. + +2004-07-15 08:08:32 David Champion (roessler) + + * doc/manual.sgml.head, init.c, init.h, mutt.h: v3 of the generic + spam detection patch. + +2004-07-14 05:58:30 Moritz Schulte (roessler) + + * pgp.c: Do not forget to handle special-case for gpg-agent. + +2004-07-14 05:55:40 Thomas Roessler (roessler) + + * ChangeLog: Fix an earlier commit message. + +2004-07-14 05:45:18 TAKAHASHI Tamotsu (roessler) + + * browser.c: Fix Debian#237426. (Experimental.) + +2004-07-14 05:39:23 Thomas Roessler (roessler) + + * compose.c: Don't invoke "builtin" as an external editor. Note: + It's not clear to me that this is really the right approach. + Revisit Editor/Visual some time. + +2004-07-14 05:19:15 Elmar Hoffmann (roessler) + + * init.h, mutt.h, thread.c: By default Mutt hides the subject + of messages in the thread tree that have the same subject as + their parent or closest previously displayed sibling. This patch + makes this optional, introducing the hide_thread_subject boolean + setting which defaults to the old behaviour. + +2004-07-14 05:07:18 Thomas Roessler (roessler) + + * mh.c: Some eye-candy during the delayed parsing of maildir + folders. + +2004-07-14 04:50:19 TAKAHASHI Tamotsu (roessler) + + * init.h, sort.h: Hack to fix $sort_browser documentation. + + * copy.c, copy.h, handler.c, init.h, mutt.h, send.c: + $include_onlyfirst, again. + +2004-07-14 04:34:07 Thomas Roessler (roessler) + + * copy.c, copy.h, handler.c, init.h, mutt.h, send.c: Fix a cvs + commit SNAFU: This commit undoes the include_onlyfirst patch, + but leaves the generic spam detection by David Champion in place + (which, erroneously, hadn't been committed separately). + +2004-07-14 04:16:58 ttakah@lapis.plala.or.jp (roessler) + + * commands.c, copy.c, copy.h, doc/manual.sgml.head, + doc/muttrc.man.head, globals.h, handler.c, hdrline.c, init.c, + init.h, mutt.h, muttlib.c, parse.c, pattern.c, protos.h, send.c, + sort.c, sort.h: Introduce $include_onlyfirst. + +2004-07-12 13:35:27 Thomas Roessler (roessler) + + * pager.c: The limitations for OP_MAIL and OP_RECALL should + be identical. + +2004-07-12 13:22:24 Thomas Roessler (roessler) + + * init.c, sendlib.c: Add some debugging code, and rewrite the + previously-ununderstandable mutt_remove_duplicates. (All this + done on the search for a problem that ultimately turned out to + be a configuration issue. Still, the changed code could come in + handy some day.) + +2004-07-11 16:25:00 TAKAHASHI Tamotsu (roessler) + + * pager.c: Fix #1882. + +2004-06-27 13:54:51 Thomas Roessler (roessler) + + * postpone.c: Experimental code for #1910. + +2004-06-26 08:45:29 Thomas Roessler (roessler) + + * commands.c: Fix #1909. + +2004-06-23 08:09:43 Thomas Roessler (roessler) + + * pgp.c: Zero out the PGP passphrase before asking for a new one. + +2004-06-17 20:39:20 Thomas Roessler (roessler) + + * smime.c: Change S/MIME send menu behavior to xor instead of or, + so it behaves the same way as the PGP send menu. + +2004-06-17 20:36:13 Moritz Schulte (roessler) + + * Makefile.am, compose.c, configure.in, crypt-mod-pgp-classic.c, + crypt-mod-smime-classic.c, crypt-mod.c, crypt-mod.h, crypt.c, + cryptglue.c, curs_lib.c, init.h, keymap.c, keymap.h, main.c, + mutt.h, mutt_crypt.h, mutt_curses.h, pgp.c, pgp.h, smime.c, + smime.h: This is the sequel to the crypto modularization changes + I did on 2003-01-21. Moritz added another abstraction layer + which cleans up the code and allows the crypto modules to use + their own option menu. Everything should work as it used to + but is now in a really good shape for part III, the Return of + the GnuPG Easy Makers. -wk + + * crypt-mod-pgp-classic.c, crypt-mod-smime-classic.c, crypt-mod.c, + crypt-mod.h: New files. + + * smime.c (smime_valid_passphrase, smime_send_menu): New + functions. * smime.h: Removed macro: smime_valid_passphrase. + Declared: smime_valid_passphrase, smime_send_menu. * pgp.c: + Include "mutt_menu.h". (pgp_valid_passphrase, pgp_send_menu): + New functions. * pgp.h: Removed macro: pgp_valid_passphrase. + Declared: pgp_valid_passphrase, pgp_send_menu. * + mutt_curses.h: Declare: mutt_need_hard_redraw. * mutt_crypt.h: + Declare: crypt_pgp_valid_passphrase, crypt_pgp_send_menu, + crypt_smime_valid_passphrase, crypt_smime_send_menu, crypt_init. + Adjust WithCrypto definition since the GPGME backend does not + exclude anymore the other `classic' backends. (KEYFLAG_ISX509): + New symbol. * mutt.h (enum): New symbol: OPTCRYPTUSEGPGME. + (struct body): New member: is_signed_data, warnsig. * main.c + (main): Call crypt_init. * keymap.c (km_get_table): Support for + MENU_KEY_SELECT_PGP and MENU_KEY_SELECT_SMIME. (Menus): Added + entries fuer MENU_KEY_SELECT_PGP and MENU_KEY_SELECT_SMIME. + (km_init): Create bindings for MENU_KEY_SELECT_PGP and + MENU_KEY_SELECT_SMIME. * keymap.h (enum): New enum symbols: + MENU_KEY_SELECT_PGP, MENU_KEY_SELECT_SMIME. * init.h: + New configuration variable: crypt_use_gpgme. * compose.c + (pgp_send_menu, smime_send_menu): Removed functions, they are now + contained in the crypto backend modules. (mutt_compose_menu): + Use crypt_pgp_send_menu and crypt_smime_send_menu instead + pgp_send_menu and smime_send_menu. * cryptglue.c: Slightly + rewritten in order to make use of the module mechanism used to + access crypto backends. * curs_lib.c (mutt_need_hard_redraw): + New function. * crypt.c (crypt_forget_passphrase): Adjust + for new crypto backend interface. (crypt_valid_passphrase): + Stripped, use calls to crypt_pgp_valid_passphrase and + crypt_smime_valid_passphrase. + +2004-06-02 17:55:34 Alain Bench (roessler) + + * parse.c: Fix #1759. + +2004-04-30 06:49:37 Urs Janßen (roessler) + + * doc/Makefile.in, doc/mbox.man, doc/mmdf.man: mmdf(5), new mbox + (5). (These changes have been sitting in my inbox for ages, tlr.) + +2004-04-13 15:10:38 Brendan Cully (roessler) + + * imap/message.c: Fix #1795 + +2004-04-13 08:02:12 David Shaw (roessler) + + * crypt.c, init.h, mutt.h: Rename pgp_mime_ask to pgp_mime_auto; + change the default; change the error message given if that + variable is set to "no." + +2004-04-12 21:43:33 Thomas Roessler (roessler) + + * lib.c, attach.c: Don't open a file for writing that we have + unlinked before. Reported embarassingly long ago by Jarno + Huuskonen . + +2004-04-12 21:19:31 Dale Woolridge (roessler) + + * po/uk.po, po/zh_CN.po, po/zh_TW.po, po/pt_BR.po, po/ru.po, + po/sk.po, po/sv.po, po/tr.po, po/gl.po, po/hu.po, po/id.po, + po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, + po/cs.po, po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, + po/et.po, po/fr.po, compose.c, crypt.c, init.h, mutt.h, + mutt_crypt.h, po/ca.po, postpone.c, send.c, sendlib.c: See: + http://does-not-exist.org/mail-archives/mutt-dev/msg00843.html + +2004-04-12 20:37:19 Thomas Roessler (roessler) + + * copy.c: Fix #1804. (From vincent@vinc17.org) + + * commands.c, curs_main.c, mutt.h, mutt_crypt.h, pager.c, + recvattach.c: A belated fix for #1808 (Debian #233106): Make + sure check-traditional-pgp doesn't leave the pager context + unnecessarily. This makes message-hooks like this one safe: + + message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' + \ "exec check-traditional-pgp" + +2004-04-12 19:53:29 TAKAHASHI Tamotsu (roessler) + + * doc/manual.sgml.head, init.h: Various documentation fixes, + #1790. + +2004-04-12 19:47:59 Alain Bench (roessler) + + * doc/mbox.man, doc/muttbug.man: Fix #1831, Debian#237827. + +2004-04-12 19:42:10 Joël Riou (roessler) + + * globals.h, init.c, init.h: Introduce config_charset. + +2004-04-12 19:37:59 Vsevolod Volkov (roessler) + + * po/ru.po: update + +2004-04-12 19:37:23 Im Eunjea (roessler) + + * po/ko.po: update + +2004-04-12 19:34:45 Holger Weiss (roessler) + + * doc/manual.sgml.head, doc/muttrc.man.head, mutt.h, pattern.c: + Unreferenced messages pattern: ~$ + +2004-04-12 19:20:13 Paul WALKER (roessler) + + * mutt_sasl.c: SASL2 needs errno.h. + +2004-04-12 19:17:32 Thomas Roessler (roessler) + + * muttlib.c: Include the user ID with temporary file names. + Suggested by eravin@panix.com in #1833. + + * doc/Makefile.in: Fix #1708 the brutal way, by installing + multiple copies of the muttbug (pardon, flea) manual page. + +2004-04-12 18:56:18 Neil Brown (roessler) + + * imap/auth_sasl.c: Fix Debian #206078, #214758; patch submitted + by Artur Czechowski as #1845. + +2004-03-21 16:02:10 Ivan Vilata i Balaguer (roessler) + + * po/ca.po: update + +2004-02-12 08:51:07 Thomas Roessler (roessler) + + * po/uk.po, po/zh_CN.po, po/zh_TW.po, po/sk.po, po/sv.po, + po/tr.po, po/pt_BR.po, po/ru.po, po/nl.po, po/pl.po, po/ja.po, + po/ko.po, po/lt.po, po/id.po, po/it.po, po/gl.po, po/hu.po, + po/es.po, po/et.po, po/fr.po, po/el.po, po/eo.po, po/da.po, + po/de.po, VERSION, po/bg.po, po/ca.po, po/cs.po, reldate.h, + ChangeLog: automatic post-release commit for mutt-1.4.2.1 + + * Makefile.am: (stable) Include regex.c and snprintf.c with + the distribution. + +2004-02-11 14:03:38 Thomas Roessler (roessler) + + * po/zh_TW.po, po/uk.po, po/zh_CN.po, po/tr.po, po/sv.po, + po/ru.po, po/sk.po, po/pt_BR.po, po/pl.po, po/nl.po, po/ko.po, + po/lt.po, po/ja.po, po/it.po, po/id.po, po/hu.po, po/gl.po, + po/et.po, po/fr.po, po/eo.po, po/es.po, po/el.po, po/de.po, + po/cs.po, po/da.po, po/ca.po, VERSION, po/bg.po, reldate.h, + ChangeLog: automatic post-release commit for mutt-1.4.2 + + * configure.in, menu.c: Backport an old bug fix, and make sure + configure can be created on recent systems. + +2004-02-11 08:20:25 Mads Martin Joergensen (roessler) + + * init.c: Fix some warnings. + +2004-02-08 11:41:31 Edmund GRIMLEY EVANS (roessler) + + * charset.c: Fix a CP1255/8-related problem that's caused by a + glibc/iconv bug. + +2004-02-08 09:38:38 Thomas Roessler (roessler) + + * muttlib.c: Change the logic in mutt_open_read to only + catch directories -- mutt may legitimately read devices (think + /dev/null) or named pipes. Also delegate error reporting to the + calling function by setting errno. + +2004-02-07 21:40:11 TAKAHASHI Tamotsu (roessler) + + * po/ja.po: update + +2004-02-07 21:38:32 Juan Altmayer Pizzorno (roessler) + + * mbox.c: Hi, off_t is a 64-bit number (like on Mac OS X/darwin), + the percentages don't show right while mutt is reading/parsing + a mailbox. Here's a patch (against 1.5.6i) to fix that. + +2004-02-07 21:36:41 David Yitzchak Cohen (roessler) + + * init.c, muttlib.c: Looking at the code, the problem is pretty + obvious. A recent patch to init.c (the one that was supposed + to prevent Mutt from silently failing to read nonexistant RC + files, IIRC) changed source_rc() to stat(2) the RC "file" before + trying to mutt_open_read() it. There's only one problem here: + source_rc() has no way of knowing whether or not its "file" + is a file or a command. I'm attaching a patch that fixes the + problem in what I believe is the right way. + +2004-02-05 14:17:25 Thomas Roessler (roessler) + + * menu.c: Back out the patch for #1697. + +2004-02-02 18:17:46 Roland Rosenfeld (roessler) + + * po/de.po: update + +2004-02-02 10:26:14 Pawel Dziekonski (roessler) + + * po/pl.po: update + +2004-02-02 10:24:32 Im Eunjea (roessler) + + * po/ko.po: update + +2004-02-02 10:22:56 Vincent Lefevre (roessler) + + * po/fr.po: update + +2004-02-01 18:26:13 Thomas Roessler (roessler) + + * po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, + po/zh_CN.po, po/zh_TW.po, po/id.po, po/it.po, po/ja.po, po/ko.po, + po/lt.po, po/nl.po, po/pl.po, VERSION, po/bg.po, po/ca.po, + po/cs.po, po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, + po/et.po, po/fr.po, po/gl.po, po/hu.po, reldate.h: automatic + post-release commit for mutt-1.5.6 + 2004-02-01 18:00:16 Mike Schiraldi <1074468571@schiraldi.org> (roessler) * init.c: As you all know, running "mutt -F foo.rc" will have diff --git a/Makefile.am b/Makefile.am index ca0d2dc..62b0092 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,8 +27,8 @@ muttng_SOURCES = $(BUILT_SOURCES) \ rfc822.c rfc1524.c rfc2047.c rfc2231.c \ score.c send.c sendlib.c signal.c sort.c \ status.c system.c thread.c charset.c history.c lib.c \ - muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c \ - url.c ascii.c mutt_idna.c sidebar.c hcache.c + muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c md5c.c \ + url.c ascii.c mutt_idna.c sidebar.c hcache.c crypt-mod.c crypt-mod.h muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \ $(INTLLIBS) $(LIBICONV) @@ -63,12 +63,12 @@ EXTRA_muttng_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c \ pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c \ browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c \ pgppacket.c mutt_idna.h nntp.c newsrc.c mutt_libesmtp.c \ - sidebar.h + sidebar.h crypt-mod-pgp-classic.c crypt-mod-smime-classic.c EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ configure acconfig.h account.h \ compress.h \ - attach.h buffy.h charset.h copy.h dotlock.h functions.h gen_defs \ + attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \ globals.h hash.h history.h init.h keymap.h mutt_crypt.h \ mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \ mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h \ @@ -155,23 +155,24 @@ install-data-local: Muttngrc # used manually. pclean: - cat /dev/null > PATCHES + cat /dev/null > $(top_srcdir)/PATCHES check-security: - ./check_sec.sh + (cd $(top_srcdir) && ./check_sec.sh) commit-real: - cvs commit + (cd $(top_srcdir) && cvs commit) commit-changelog: - cvs commit -m "# changelog commit" ChangeLog + (cd $(top_srcdir) && cvs commit -m "# changelog commit" ChangeLog) commit: pclean check-security commit-real changelog commit-changelog changelog: - cvs update ChangeLog - sh ./mkchangelog.sh | fmt -c | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog - $${VISUAL:-vi} ChangeLog + (cd $(top_srcdir); \ + cvs update ChangeLog; \ + sh ./mkchangelog.sh | fmt -c | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \ + $${VISUAL:-vi} ChangeLog) ChangeLog: changelog diff --git a/Makefile.in b/Makefile.in index aaef27c..70b58a1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -119,7 +119,7 @@ bin_SCRIPTS = muttngbug fleang BUILT_SOURCES = keymap_defs.h patchlist.c bin_PROGRAMS = muttng @DOTLOCK_TARGET@ @PGPAUX_TARGET@ @SMIMEAUX_TARGET@ -muttng_SOURCES = $(BUILT_SOURCES) addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c compress.c crypt.c cryptglue.c commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c edit.c enter.c flags.c init.c filter.c from.c getdomain.c handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c postpone.c query.c recvattach.c recvcmd.c rfc822.c rfc1524.c rfc2047.c rfc2231.c score.c send.c sendlib.c signal.c sort.c status.c system.c thread.c charset.c history.c lib.c muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c url.c ascii.c mutt_idna.c sidebar.c hcache.c +muttng_SOURCES = $(BUILT_SOURCES) addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c compress.c crypt.c cryptglue.c commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c edit.c enter.c flags.c init.c filter.c from.c getdomain.c handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c main.c mbox.c menu.c mh.c mx.c pager.c parse.c pattern.c postpone.c query.c recvattach.c recvcmd.c rfc822.c rfc1524.c rfc2047.c rfc2231.c score.c send.c sendlib.c signal.c sort.c status.c system.c thread.c charset.c history.c lib.c muttlib.c editmsg.c utf8.c mbyte.c wcwidth.c md5c.c url.c ascii.c mutt_idna.c sidebar.c hcache.c crypt-mod.c crypt-mod.h muttng_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) $(INTLLIBS) $(LIBICONV) @@ -148,10 +148,10 @@ INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl CPPFLAGS = @CPPFLAGS@ -I$(includedir) -EXTRA_muttng_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c pgppacket.c mutt_idna.h nntp.c newsrc.c mutt_libesmtp.c sidebar.h +EXTRA_muttng_SOURCES = account.c md5c.c mutt_sasl.c mutt_socket.c mutt_ssl.c mutt_tunnel.c pop.c pop_auth.c pop_lib.c smime.c pgp.c pgpinvoke.c pgpkey.c pgplib.c sha1.c pgpmicalg.c gnupgparse.c resize.c dotlock.c remailer.c browser.h mbyte.h remailer.h url.h mutt_ssl_nss.c pgppacket.c mutt_idna.h nntp.c newsrc.c mutt_libesmtp.c sidebar.h crypt-mod-pgp-classic.c crypt-mod-smime-classic.c -EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO configure acconfig.h account.h compress.h attach.h buffy.h charset.h copy.h dotlock.h functions.h gen_defs globals.h hash.h history.h init.h keymap.h mutt_crypt.h mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h mx.h pager.h pgp.h pop.h protos.h reldate.h rfc1524.h rfc2047.h rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare nntp.h ChangeLog.nntp _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc makedoc.c stamp-doc-rc README.SSL smime.h muttngbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h snprintf.c regex.c mutt_libesmtp.h +EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO configure acconfig.h account.h compress.h attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs globals.h hash.h history.h init.h keymap.h mutt_crypt.h mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h mutt_regex.h mutt_sasl.h mutt_socket.h mutt_ssl.h mutt_tunnel.h mx.h pager.h pgp.h pop.h protos.h reldate.h rfc1524.h rfc2047.h rfc2231.h rfc822.h sha1.h sort.h mime.types VERSION prepare nntp.h ChangeLog.nntp _regex.h OPS.MIX README.SECURITY remailer.c remailer.h browser.h mbyte.h lib.h extlib.c pgpewrap.c smime_keys.pl pgplib.h Muttngrc.head Muttngrc makedoc.c stamp-doc-rc README.SSL smime.h muttngbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh ChangeLog.old mkchangelog.sh cvslog2changelog.pl mutt_idna.h snprintf.c regex.c mutt_libesmtp.h muttng_dotlock_SOURCES = mutt_dotlock.c @@ -193,8 +193,8 @@ hdrline.o headers.o help.o hook.o keymap.o main.o mbox.o menu.o mh.o \ mx.o pager.o parse.o pattern.o postpone.o query.o recvattach.o \ recvcmd.o rfc822.o rfc1524.o rfc2047.o rfc2231.o score.o send.o \ sendlib.o signal.o sort.o status.o system.o thread.o charset.o \ -history.o lib.o muttlib.o editmsg.o utf8.o mbyte.o wcwidth.o url.o \ -ascii.o mutt_idna.o sidebar.o hcache.o +history.o lib.o muttlib.o editmsg.o utf8.o mbyte.o wcwidth.o md5c.o \ +url.o ascii.o mutt_idna.o sidebar.o hcache.o crypt-mod.o muttng_LDFLAGS = SCRIPTS = $(bin_SCRIPTS) @@ -638,23 +638,24 @@ install-data-local: Muttngrc # used manually. pclean: - cat /dev/null > PATCHES + cat /dev/null > $(top_srcdir)/PATCHES check-security: - ./check_sec.sh + (cd $(top_srcdir) && ./check_sec.sh) commit-real: - cvs commit + (cd $(top_srcdir) && cvs commit) commit-changelog: - cvs commit -m "# changelog commit" ChangeLog + (cd $(top_srcdir) && cvs commit -m "# changelog commit" ChangeLog) commit: pclean check-security commit-real changelog commit-changelog changelog: - cvs update ChangeLog - sh ./mkchangelog.sh | fmt -c | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog - $${VISUAL:-vi} ChangeLog + (cd $(top_srcdir); \ + cvs update ChangeLog; \ + sh ./mkchangelog.sh | fmt -c | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \ + $${VISUAL:-vi} ChangeLog) ChangeLog: changelog diff --git a/Muttrc b/Muttrc index 7666cf5..996088c 100644 --- a/Muttrc +++ b/Muttrc @@ -197,7 +197,7 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # following printf-style sequences are understood: # # %C charset -# %c reqiures charset conversion (n or c) +# %c requires charset conversion (n or c) # %D deleted flag # %d description # %e MIME content-transfer-encoding @@ -393,7 +393,7 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # Default: "-- Mutt: Compose [Approx. msg size: %l Atts: %a]%>-" # # -# Controls the format of the status line displayed in the \fCompose +# Controls the format of the status line displayed in the Compose # menu. This string is similar to ``$status_format'', but has its own # set of printf()-like sequences: # @@ -407,6 +407,17 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # information on how to set ``$compose_format''. # # +# set config_charset="" +# +# Name: config_charset +# Type: string +# Default: "" +# +# +# When defined, Mutt will recode commands in rc files from this +# encoding. +# +# # set confirmappend=yes # # Name: confirmappend @@ -463,6 +474,20 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # ``$save_name'', ``$force_name'' and ``fcc-hook''. # # +# set crypt_use_gpgme=no +# +# Name: crypt_use_gpgme +# Type: boolean +# Default: no +# +# +# This variable controls the use the GPGME enabled crypto backends. +# If it is set and Mutt was build with gpgme support, the gpgme code for +# S/MIME and PGP will be used instead of the classic code. Note, that +# you need to use this option in .muttrc as it won't have any effect when +# used interactively. +# +# # set crypt_autopgp=yes # # Name: crypt_autopgp @@ -560,8 +585,8 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # Default: yes # # -# If this option is set, mutt's revattach menu will not show the subparts of -# individual messages in a digest. To see these subparts, press 'v' on that menu. +# If this option is set, mutt's received-attachments menu will not show the subparts of +# individual messages in a multipart/digest. To see these subparts, press 'v' on that menu. # # # set display_filter="" @@ -1010,6 +1035,18 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # thread tree. # # +# set hide_thread_subject=yes +# +# Name: hide_thread_subject +# Type: boolean +# Default: yes +# +# +# When set, mutt will not show the subject of messages in the thread +# tree that have the same subject as their parent or closest previously +# displayed sibling. +# +# # set hide_top_limited=no # # Name: hide_top_limited @@ -1096,8 +1133,8 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # This is a colon-delimited list of authentication methods mutt may # attempt to use to log in to an IMAP server, in the order mutt should # try them. Authentication methods are either 'login' or the right -# side of an IMAP 'AUTH=xxx' capability string, eg 'digest-md5', -# 'gssapi' or 'cram-md5'. This parameter is case-insensitive. If this +# side of an IMAP 'AUTH=xxx' capability string, eg 'digest-md5', 'gssapi' +# or 'cram-md5'. This parameter is case-insensitive. If this # parameter is unset (the default) mutt will try all available methods, # in order from most-secure to least-secure. # @@ -1131,6 +1168,20 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # connecting to IMAP servers. # # +# set imap_headers="" +# +# Name: imap_headers +# Type: string +# Default: "" +# +# +# Mutt requests these header fields in addition to the default headers +# ("DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE +# CONTENT-DESCRIPTION IN-REPLY-TO REPLY-TO LINES X-LABEL") from IMAP +# servers before displaying the index menu. You may want to add more +# headers for spam detection. Note: This is a space separated list. +# +# # set imap_home_namespace="" # # Name: imap_home_namespace @@ -1263,6 +1314,17 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # is included in your reply. # # +# set include_onlyfirst=no +# +# Name: include_onlyfirst +# Type: boolean +# Default: no +# +# +# Controls whether or not Mutt includes only the first attachment +# of the message you are replying. +# +# # set indent_string="> " # # Name: indent_string @@ -2161,6 +2223,55 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # (PGP only) # # +# set pgp_autoinline=no +# +# Name: pgp_autoinline +# Type: boolean +# Default: no +# +# +# This option controls whether Mutt generates old-style inline +# (traditional) PGP encrypted or signed messages under certain +# circumstances. This can be overridden by use of the pgp-menu, +# when inline is not required. +# +# Note that Mutt might automatically use PGP/MIME for messages +# which consist of more than a single MIME part. Mutt can be +# configured to ask before sending PGP/MIME messages when inline +# (traditional) would not work. +# See also: ``$pgp_mime_auto''. +# +# Also note that using the old-style PGP message format is strongly +# deprecated. +# (PGP only) +# +# +# set pgp_replyinline=no +# +# Name: pgp_replyinline +# Type: boolean +# Default: no +# +# +# Setting this variable will cause Mutt to always attempt to +# create an inline (traditional) message when replying to a +# message which is PGP encrypted/signed inline. This can be +# overridden by use of the pgp-menu, when inline is not +# required. This option does not automatically detect if the +# (replied-to) message is inline; instead it relies on Mutt +# internals for previously checked/flagged messages. +# +# Note that Mutt might automatically use PGP/MIME for messages +# which consist of more than a single MIME part. Mutt can be +# configured to ask before sending PGP/MIME messages when inline +# (traditional) would not work. +# See also: ``$pgp_mime_auto''. +# +# Also note that using the old-style PGP message format is strongly +# deprecated. +# (PGP only) +# +# # set pgp_show_unusable=yes # # Name: pgp_show_unusable @@ -2234,47 +2345,22 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # (PGP only) # # -# set pgp_create_traditional=no +# set pgp_mime_auto=ask-yes # -# Name: pgp_create_traditional +# Name: pgp_mime_auto # Type: quadoption -# Default: no -# +# Default: ask-yes # -# This option controls whether Mutt generates old-style inline PGP -# encrypted or signed messages. # -# Note that PGP/MIME will be used automatically for messages which have -# a character set different from us-ascii, or which consist of more than -# a single MIME part. +# This option controls whether Mutt will prompt you for +# automatically sending a (signed/encrypted) message using +# PGP/MIME when inline (traditional) fails (for any reason). # # Also note that using the old-style PGP message format is strongly # deprecated. # (PGP only) # # -# set pgp_auto_traditional=no -# -# Name: pgp_auto_traditional -# Type: boolean -# Default: no -# -# -# This option causes Mutt to generate an old-style inline PGP -# encrypted or signed message when replying to an old-style -# message, and a PGP/MIME message when replying to a PGP/MIME -# message. Note that this option is only meaningful when using -# ``$crypt_replyencrypt'', ``$crypt_replysign'', or -# ``$crypt_replysignencrypted''. -# -# Also note that PGP/MIME will be used automatically for messages -# which have a character set different from us-ascii, or which -# consist of more than a single MIME part. -# -# This option overrides ``$pgp_create_traditional'' -# (PGP only) -# -# # set pgp_decode_command="" # # Name: pgp_decode_command @@ -2656,8 +2742,8 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # # # This command is used to extract only the signers X509 certificate from a S/MIME -# signature, so that the certificate's owner may get compared to the email's -# 'From'-field. +# signature, so that the certificate's owner may get compared to the +# email's 'From'-field. # (S/MIME only) # # @@ -2709,11 +2795,11 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # use STARTTLS regardless of the server's capabilities. # # -# set certificate_file="" +# set certificate_file="~/.mutt_certificates" # # Name: certificate_file # Type: path -# Default: "" +# Default: "~/.mutt_certificates" # # # This variable specifies the file where the certificates you trust @@ -2785,6 +2871,17 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # SSL authentication process. # # +# set ssl_client_cert="" +# +# Name: ssl_client_cert +# Type: path +# Default: "" +# +# +# The file containing a client certificate and its associated private +# key. +# +# # set pipe_split=no # # Name: pipe_split @@ -3279,8 +3376,10 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # move the messages to another machine, and reply to some the messages # from there. If this variable is set, the default From: line of # the reply messages is built using the address where you received the -# messages you are replying to. If the variable is unset, the -# From: line will use your address on the current machine. +# messages you are replying to if that address matches your +# alternates. If the variable is unset, or the address that would be +# used doesn't match your alternates, the From: line will use +# your address on the current machine. # # # set reverse_realname=yes @@ -3621,6 +3720,7 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # mailbox-order (unsorted) # score # size +# spam # subject # threads # to @@ -3666,11 +3766,11 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # but kept to not break any existing configuration setting). # # -# set sort_browser=subject +# set sort_browser=alpha # # Name: sort_browser # Type: sort order -# Default: subject +# Default: alpha # # # Specifies how to sort entries in the file browser. By default, the @@ -3702,6 +3802,20 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # non-``$reply_regexp'' parts of both messages are identical. # # +# set spam_separator="," +# +# Name: spam_separator +# Type: string +# Default: "," +# +# +# ``spam_separator'' controls what happens when multiple spam headers +# are matched: if unset, each successive header will overwrite any +# previous matches value for the spam label. If set, each successive +# match will append to the previous, using ``spam_separator'' as a +# separator. +# +# # set spoolfile="" # # Name: spoolfile @@ -4009,18 +4123,6 @@ macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documenta # Normally, the default should work. # # -# set use_ipv6=yes -# -# Name: use_ipv6 -# Type: boolean -# Default: yes -# -# -# When set, Mutt will look for IPv6 addresses of hosts it tries to -# contact. If this option is unset, Mutt will restrict itself to IPv4 addresses. -# Normally, the default should work. -# -# # set user_agent=yes # # Name: user_agent diff --git a/VERSION b/VERSION index eac1e0a..f01291b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.6 +1.5.7 diff --git a/addrbook.c b/addrbook.c index 08bed17..fb20f2f 100644 --- a/addrbook.c +++ b/addrbook.c @@ -74,12 +74,12 @@ alias_format_str (char *dest, size_t destlen, char op, const char *src, return (src); } -void alias_entry (char *s, size_t slen, MUTTMENU *m, int num) +static void alias_entry (char *s, size_t slen, MUTTMENU *m, int num) { mutt_FormatString (s, slen, NONULL (AliasFmt), alias_format_str, (unsigned long) ((ALIAS **) m->data)[num], M_FORMAT_ARROWCURSOR); } -int alias_tag (MUTTMENU *menu, int n, int m) +static int alias_tag (MUTTMENU *menu, int n, int m) { ALIAS *cur = ((ALIAS **) menu->data)[n]; int ot = cur->tagged; diff --git a/attach.c b/attach.c index 2179a49..a49749b 100644 --- a/attach.c +++ b/attach.c @@ -108,7 +108,8 @@ int mutt_compose_attachment (BODY *a) if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES) != M_YES) goto bailout; } - unlink_newfile = 1; + else + unlink_newfile = 1; } else strfcpy(newfile, a->filename, sizeof(newfile)); @@ -173,7 +174,11 @@ int mutt_compose_attachment (BODY *a) fclose (fp); fclose (tfp); mutt_unlink (a->filename); - mutt_rename_file (tempfile, a->filename); + if (mutt_rename_file (tempfile, a->filename) != 0) + { + mutt_perror _("Failure to rename file."); + goto bailout; + } mutt_free_body (&b); } @@ -235,7 +240,8 @@ int mutt_edit_attachment (BODY *a) if (mutt_yesorno (_("Can't match nametemplate, continue?"), M_YES) != M_YES) goto bailout; } - unlink_newfile = 1; + else + unlink_newfile = 1; } else strfcpy(newfile, a->filename, sizeof(newfile)); @@ -607,6 +613,7 @@ int mutt_view_attachment (FILE *fp, BODY *a, int flag, HEADER *hdr, rc = mutt_do_pager (descrip, pagerfile, M_PAGER_ATTACHMENT | (is_message ? M_PAGER_MESSAGE : 0), &info); + *pagerfile = '\0'; } else rc = 0; diff --git a/browser.c b/browser.c index 61bf178..2012ec8 100644 --- a/browser.c +++ b/browser.c @@ -644,7 +644,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct browser_state *state) return 0; } -int select_file_search (MUTTMENU *menu, regex_t *re, int n) +static int select_file_search (MUTTMENU *menu, regex_t *re, int n) { #ifdef USE_NNTP if (option (OPTNEWS)) @@ -653,7 +653,7 @@ int select_file_search (MUTTMENU *menu, regex_t *re, int n) return (regexec (re, ((struct folder_file *) menu->data)[n].name, 0, NULL, 0)); } -void folder_entry (char *s, size_t slen, MUTTMENU *menu, int num) +static void folder_entry (char *s, size_t slen, MUTTMENU *menu, int num) { FOLDER folder; @@ -715,7 +715,7 @@ static void init_menu (struct browser_state *state, MUTTMENU *menu, char *title, menu->redraw = REDRAW_FULL; } -int file_tag (MUTTMENU *menu, int n, int m) +static int file_tag (MUTTMENU *menu, int n, int m) { struct folder_file *ff = &(((struct folder_file *)menu->data)[n]); int ot; @@ -803,8 +803,8 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, int *num else { getcwd (LastDir, sizeof (LastDir)); - strcat (LastDir, "/"); /* __STRCAT_CHECKED__ */ - strncat (LastDir, f, i); + safe_strcat (LastDir, sizeof (LastDir), "/"); + safe_strncat (LastDir, sizeof (LastDir), f, i); } } else @@ -1177,21 +1177,21 @@ void _mutt_select_file (char *f, size_t flen, int flags, char ***files, int *num { if (S_ISDIR (st.st_mode)) { - strfcpy (LastDir, buf, sizeof (LastDir)); destroy_state (&state); - if (examine_directory (menu, &state, LastDir, prefix) == 0) - { - menu->current = 0; - menu->top = 0; - init_menu (&state, menu, title, sizeof (title), buffy); - } + if (examine_directory (menu, &state, buf, prefix) == 0) + strfcpy (LastDir, buf, sizeof (LastDir)); else { mutt_error _("Error scanning directory."); - destroy_state (&state); - mutt_menuDestroy (&menu); - goto bail; + if (examine_directory (menu, &state, LastDir, prefix) == -1) + { + mutt_menuDestroy (&menu); + goto bail; + } } + menu->current = 0; + menu->top = 0; + init_menu (&state, menu, title, sizeof (title), buffy); } else mutt_error (_("%s is not a directory."), buf); diff --git a/buffy.c b/buffy.c index 4234a4e..88e1cbd 100644 --- a/buffy.c +++ b/buffy.c @@ -508,7 +508,7 @@ int mutt_buffy_list (void) pos = 0; first = 1; buffylist[0] = 0; - pos += strlen (strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); + pos += strlen (strncat (buffylist, _("New mail in "), sizeof (buffylist) - 1 - pos)); /* __STRNCAT_CHECKED__ */ for (tmp = Incoming; tmp; tmp = tmp->next) { /* Is there new mail in this mailbox? */ @@ -522,21 +522,21 @@ int mutt_buffy_list (void) break; if (!first) - pos += strlen (strncat(buffylist + pos, ", ", sizeof(buffylist)-1-pos)); + pos += strlen (strncat(buffylist + pos, ", ", sizeof(buffylist)-1-pos)); /* __STRNCAT_CHECKED__ */ /* Prepend an asterisk to mailboxes not already notified */ if (!tmp->notified) { - /* pos += strlen (strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos)); */ + /* pos += strlen (strncat(buffylist + pos, "*", sizeof(buffylist)-1-pos)); __STRNCAT_CHECKED__ */ tmp->notified = 1; BuffyNotify--; } - pos += strlen (strncat(buffylist + pos, path, sizeof(buffylist)-1-pos)); + pos += strlen (strncat(buffylist + pos, path, sizeof(buffylist)-1-pos)); /* __STRNCAT_CHECKED__ */ first = 0; } if (!first && tmp) { - strncat (buffylist + pos, ", ...", sizeof (buffylist) - 1 - pos); + strncat (buffylist + pos, ", ...", sizeof (buffylist) - 1 - pos); /* __STRNCAT_CHECKED__ */ } if (!first) { diff --git a/charset.c b/charset.c index 19c3a2b..18e9cdc 100644 --- a/charset.c +++ b/charset.c @@ -379,18 +379,24 @@ size_t mutt_iconv (iconv_t cd, ICONV_CONST char **inbuf, size_t *inbytesleft, if (*t) continue; } - if (outrepl) + /* Replace the output */ + if (!outrepl) + outrepl = "?"; + iconv (cd, 0, 0, &ob, &obl); + if (obl) { - /* Try replacing the output */ int n = strlen (outrepl); - if (n <= obl) + if (n > obl) { - memcpy (ob, outrepl, n); - ++ib, --ibl; - ob += n, obl -= n; - ++ret; - continue; + outrepl = "?"; + n = 1; } + memcpy (ob, outrepl, n); + ++ib, --ibl; + ob += n, obl -= n; + ++ret; + iconv (cd, 0, 0, 0, 0); /* for good measure */ + continue; } } *inbuf = ib, *inbytesleft = ibl; diff --git a/color.c b/color.c index b322060..152b308 100644 --- a/color.c +++ b/color.c @@ -156,7 +156,7 @@ void ci_start_color (void) #ifdef USE_SLANG_CURSES static char *get_color_name (char *dest, size_t destlen, int val) { - static char * missing[3] = {"brown", "lightgray", ""}; + static char * missing[3] = {"brown", "lightgray", "default"}; int i; switch (val) diff --git a/commands.c b/commands.c index 29e5d4c..a765de9 100644 --- a/commands.c +++ b/commands.c @@ -283,10 +283,10 @@ void ci_bounce_message (HEADER *h, int *redraw) mutt_format_string (prompt, sizeof (prompt), 0, COLS-extra_space, 0, 0, prompt, sizeof (prompt), 0); - strncat (prompt, "...?", sizeof (prompt)); + safe_strcat (prompt, sizeof (prompt), "...?"); } else - strncat (prompt, "?", sizeof (prompt)); + safe_strcat (prompt, sizeof (prompt), "?"); if (query_quadoption (OPT_BOUNCE, prompt) != M_YES) { @@ -324,7 +324,7 @@ static void pipe_set_flags (int decode, int print, int *cmflags, int *chflags) } -void pipe_msg (HEADER *h, FILE *fp, int decode, int print) +static void pipe_msg (HEADER *h, FILE *fp, int decode, int print) { int cmflags = 0; int chflags = CH_FROM; @@ -502,9 +502,9 @@ int mutt_select_sort (int reverse) int method = Sort; /* save the current method in case of abort */ switch (mutt_multi_choice (reverse ? - _("Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: ") : - _("Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "), - _("dfrsotuzc"))) + _("Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)am?: ") : + _("Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)am?: "), + _("dfrsotuzcp"))) { case -1: /* abort - don't resort */ return -1; @@ -544,6 +544,10 @@ int mutt_select_sort (int reverse) case 9: /* s(c)ore */ Sort = SORT_SCORE; break; + + case 10: /* s(p)am */ + Sort = SORT_SPAM; + break; } if (reverse) Sort |= SORT_REVERSE; @@ -1036,12 +1040,17 @@ void mutt_edit_content_type (HEADER *h, BODY *b, FILE *fp) /* inform the user */ + snprintf (tmp, sizeof (tmp), "%s/%s", TYPE (b), NONULL (b->subtype)); if (type_changed) mutt_message (_("Content-Type changed to %s."), tmp); - else if (b->type == TYPETEXT && charset_changed) + if (b->type == TYPETEXT && charset_changed) + { + if (type_changed) + mutt_sleep (1); mutt_message (_("Character set changed to %s; %s."), mutt_get_parameter ("charset", b->parameter), b->noconv ? _("not converting") : _("converting")); + } b->force_charset |= charset_changed ? 1 : 0; @@ -1071,6 +1080,8 @@ static int _mutt_check_traditional_pgp (HEADER *h, int *redraw) MESSAGE *msg; int rv = 0; + h->security |= PGP_TRADITIONAL_CHECKED; + mutt_parse_mime_message (Context, h); if ((msg = mx_open_message (Context, h->msgno)) == NULL) return 0; @@ -1089,12 +1100,13 @@ int mutt_check_traditional_pgp (HEADER *h, int *redraw) { int i; int rv = 0; - if (h) + if (h && !(h->security & PGP_TRADITIONAL_CHECKED)) rv = _mutt_check_traditional_pgp (h, redraw); else { for (i = 0; i < Context->vcount; i++) - if (Context->hdrs[Context->v2r[i]]->tagged) + if (Context->hdrs[Context->v2r[i]]->tagged && + !(Context->hdrs[Context->v2r[i]]->security & PGP_TRADITIONAL_CHECKED)) rv = _mutt_check_traditional_pgp (Context->hdrs[Context->v2r[i]], redraw) || rv; } diff --git a/compose.c b/compose.c index cc4d784..ef7ee18 100644 --- a/compose.c +++ b/compose.c @@ -1,5 +1,6 @@ /* * Copyright (C) 1996-2000 Michael R. Elkins + * Copyright (C) 2004 g10 Code GmbH * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -162,6 +163,16 @@ static void redraw_crypt_lines (HEADER *msg) addstr (_("Sign")); else addstr (_("Clear")); + + if ((WithCrypto & APPLICATION_PGP)) + if ((msg->security & APPLICATION_PGP) + && (msg->security & (ENCRYPT | SIGN))) + { + if ((msg->security & INLINE)) + addstr (_(" (inline)")); + else + addstr (_(" (PGP/MIME)")); + } clrtoeol (); move (HDR_CRYPTINFO, SidebarWidth); @@ -171,12 +182,15 @@ static void redraw_crypt_lines (HEADER *msg) printw ("%s%s", _(" sign as: "), PgpSignAs ? PgpSignAs : _("")); if ((WithCrypto & APPLICATION_SMIME) - && msg->security & APPLICATION_SMIME && msg->security & SIGN) { + && msg->security & APPLICATION_SMIME && msg->security & SIGN) { printw ("%s%s", _(" sign as: "), SmimeDefaultKey ? SmimeDefaultKey : _("")); } if ((WithCrypto & APPLICATION_SMIME) - && msg->security & APPLICATION_SMIME && (msg->security & ENCRYPT)) { + && (msg->security & APPLICATION_SMIME) + && (msg->security & ENCRYPT) + && SmimeCryptAlg + && *SmimeCryptAlg) { mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "), NONULL(SmimeCryptAlg)); off = 20; @@ -184,154 +198,6 @@ static void redraw_crypt_lines (HEADER *msg) } - -static int pgp_send_menu (HEADER *msg, int *redraw) -{ - pgp_key_t p; - char input_signas[SHORT_STRING]; - - if (!(WithCrypto & APPLICATION_PGP)) - return msg->security; - - switch (mutt_multi_choice (_("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "), - _("esabf"))) - { - case 1: /* (e)ncrypt */ - msg->security |= ENCRYPT; - break; - - case 2: /* (s)ign */ - msg->security |= SIGN; - break; - - case 3: /* sign (a)s */ - unset_option(OPTPGPCHECKTRUST); - - if ((p = crypt_pgp_ask_for_key (_("Sign as: "), NULL, - KEYFLAG_CANSIGN, PGP_PUBRING))) - { - snprintf (input_signas, sizeof (input_signas), "0x%s", - crypt_pgp_keyid (p)); - mutt_str_replace (&PgpSignAs, input_signas); - crypt_pgp_free_key (&p); - - msg->security |= SIGN; - - crypt_pgp_void_passphrase (); /* probably need a different passphrase */ - } - else - { - msg->security &= ~SIGN; - } - - *redraw = REDRAW_FULL; - break; - - case 4: /* (b)oth */ - msg->security = ENCRYPT | SIGN; - break; - - case 5: /* (f)orget it */ - msg->security = 0; - break; - } - - if (msg->security && msg->security != APPLICATION_PGP) - msg->security |= APPLICATION_PGP; - else - msg->security = 0; - - if(*redraw) - redraw_crypt_lines (msg); - return (msg->security); -} - - - -static int smime_send_menu (HEADER *msg, int *redraw) -{ - char *p; - - if (!(WithCrypto & APPLICATION_SMIME)) - return msg->security; - - switch (mutt_multi_choice (_("S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (f)orget it? "), - _("eswabf"))) - { - case 1: /* (e)ncrypt */ - msg->security |= ENCRYPT; - break; - - case 3: /* encrypt (w)ith */ - msg->security |= ENCRYPT; - switch (mutt_multi_choice (_("1: DES, 2: Triple-DES, 3: RC2-40," - " 4: RC2-64, 5: RC2-128, or (f)orget it? "), - _("12345f"))) { - case 1: - mutt_str_replace (&SmimeCryptAlg, "des"); - break; - case 2: - mutt_str_replace (&SmimeCryptAlg, "des3"); - break; - case 3: - mutt_str_replace (&SmimeCryptAlg, "rc2-40"); - break; - case 4: - mutt_str_replace (&SmimeCryptAlg, "rc2-64"); - break; - case 5: - mutt_str_replace (&SmimeCryptAlg, "rc2-128"); - break; - case 6: /* forget it */ - break; - } - break; - - case 2: /* (s)ign */ - - if(!SmimeDefaultKey) - mutt_message("Can\'t sign: No key specified. use sign(as)."); - else - msg->security |= SIGN; - break; - - case 4: /* sign (a)s */ - - if ((p = crypt_smime_ask_for_key (_("Sign as: "), NULL, 0))) { - p[mutt_strlen (p)-1] = '\0'; - mutt_str_replace (&SmimeDefaultKey, p); - - msg->security |= SIGN; - - /* probably need a different passphrase */ - crypt_smime_void_passphrase (); - } - else - msg->security &= ~SIGN; - - *redraw = REDRAW_FULL; - break; - - case 5: /* (b)oth */ - msg->security = ENCRYPT | SIGN; - break; - - case 6: /* (f)orget it */ - msg->security = 0; - break; - } - - if (msg->security && msg->security != APPLICATION_SMIME) - msg->security |= APPLICATION_SMIME; - else - msg->security = 0; - - if(*redraw) - redraw_crypt_lines (msg); - return (msg->security); -} - - #ifdef MIXMASTER static void redraw_mix_line (LIST *chain) @@ -586,7 +452,7 @@ static unsigned long cum_attachs_size (MUTTMENU *menu) } /* prototype for use below */ -void compose_status_line (char *buf, size_t buflen, MUTTMENU *menu, +static void compose_status_line (char *buf, size_t buflen, MUTTMENU *menu, const char *p); /* @@ -652,7 +518,7 @@ compose_format_str (char *buf, size_t buflen, char op, const char *src, return (src); } -void compose_status_line (char *buf, size_t buflen, MUTTMENU *menu, +static void compose_status_line (char *buf, size_t buflen, MUTTMENU *menu, const char *p) { mutt_FormatString (buf, buflen, p, compose_format_str, @@ -725,24 +591,37 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ break; case OP_COMPOSE_EDIT_FROM: menu->redraw = edit_address_list (HDR_FROM, &msg->env->from); + mutt_message_hook (NULL, msg, M_SEND2HOOK); break; case OP_COMPOSE_EDIT_TO: #ifdef USE_NNTP - if (!news) + if (!news) { #endif menu->redraw = edit_address_list (HDR_TO, &msg->env->to); + mutt_message_hook (NULL, msg, M_SEND2HOOK); +#ifdef USE_NNTP + } +#endif break; case OP_COMPOSE_EDIT_BCC: #ifdef USE_NNTP - if (!news) + if (!news) { #endif menu->redraw = edit_address_list (HDR_BCC, &msg->env->bcc); + mutt_message_hook (NULL, msg, M_SEND2HOOK); +#ifdef USE_NNTP + } +#endif break; case OP_COMPOSE_EDIT_CC: #ifdef USE_NNTP - if (!news) + if (!news) { #endif menu->redraw = edit_address_list (HDR_CC, &msg->env->cc); + mutt_message_hook (NULL, msg, M_SEND2HOOK); +#ifdef USE_NNTP + } +#endif break; #ifdef USE_NNTP case OP_COMPOSE_EDIT_NEWSGROUPS: @@ -815,9 +694,11 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ if (msg->env->subject) mutt_paddstr (W, msg->env->subject); } - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; case OP_COMPOSE_EDIT_REPLY_TO: menu->redraw = edit_address_list (HDR_REPLYTO, &msg->env->reply_to); + mutt_message_hook (NULL, msg, M_SEND2HOOK); break; case OP_COMPOSE_EDIT_FCC: strfcpy (buf, fcc, sizeof (buf)); @@ -830,19 +711,22 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ fccSet = 1; } MAYBE_REDRAW (menu->redraw); - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; case OP_COMPOSE_EDIT_MESSAGE: if (Editor && (mutt_strcmp ("builtin", Editor) != 0) && !option (OPTEDITHDRS)) { mutt_edit_file (Editor, msg->content->filename); mutt_update_encoding (msg->content); menu->redraw = REDRAW_CURRENT | REDRAW_STATUS; + mutt_message_hook (NULL, msg, M_SEND2HOOK); break; } /* fall through */ case OP_COMPOSE_EDIT_HEADERS: - if (op == OP_COMPOSE_EDIT_HEADERS || - (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS))) + if (mutt_strcmp ("builtin", Editor) != 0 && + (op == OP_COMPOSE_EDIT_HEADERS || + (op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) { char *tag = NULL, *err = NULL; mutt_env_to_local (msg->env); @@ -875,7 +759,8 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ menu->max = idxlen; } - menu->redraw = REDRAW_FULL; + menu->redraw = REDRAW_FULL; + mutt_message_hook (NULL, msg, M_SEND2HOOK); break; @@ -906,7 +791,8 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ unset_option(OPTNEEDREDRAW); } - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; case OP_COMPOSE_ATTACH_FILE: @@ -952,7 +838,8 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ menu->redraw |= REDRAW_INDEX | REDRAW_STATUS; } - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; case OP_COMPOSE_ATTACH_MESSAGE: #ifdef USE_NNTP @@ -1084,7 +971,8 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ Sort = oldSort; SortAux = oldSortAux; } - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; case OP_DELETE: CHECK_COUNT; @@ -1103,7 +991,8 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ msg->content = idx[0]->content; menu->redraw |= REDRAW_STATUS; - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; #define CURRENT idx[menu->current]->content @@ -1121,6 +1010,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ else mutt_message (_("The current attachment will be converted.")); menu->redraw = REDRAW_CURRENT; + mutt_message_hook (NULL, msg, M_SEND2HOOK); break; } #undef CURRENT @@ -1137,7 +1027,8 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ mutt_str_replace (&idx[menu->current]->content->description, buf); menu->redraw = REDRAW_CURRENT; } - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; case OP_COMPOSE_UPDATE_ENCODING: CHECK_COUNT; @@ -1156,6 +1047,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ mutt_update_encoding(idx[menu->current]->content); menu->redraw = REDRAW_CURRENT | REDRAW_STATUS; } + mutt_message_hook (NULL, msg, M_SEND2HOOK); break; case OP_COMPOSE_TOGGLE_DISPOSITION: @@ -1174,7 +1066,8 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ menu->redraw = REDRAW_CURRENT; } - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; case OP_COMPOSE_EDIT_ENCODING: CHECK_COUNT; @@ -1192,9 +1085,14 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ else mutt_error _("Invalid encoding."); } - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; case OP_COMPOSE_SEND_MESSAGE: + + /* Note: We don't invoke send2-hook here, since we want to leave + * users an opportunity to change settings from the ":" prompt. + */ if(check_attachments(idx, idxlen) != 0) { @@ -1226,6 +1124,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ mutt_edit_file (NONULL(Editor), idx[menu->current]->content->filename); mutt_update_encoding (idx[menu->current]->content); menu->redraw = REDRAW_CURRENT | REDRAW_STATUS; + mutt_message_hook (NULL, msg, M_SEND2HOOK); break; case OP_COMPOSE_TOGGLE_UNLINK: @@ -1241,6 +1140,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ menu->current++; # endif menu->redraw = REDRAW_INDEX; + /* No send2hook since this doesn't change the message. */ break; case OP_COMPOSE_GET_ATTACHMENT: @@ -1258,6 +1158,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ else if (mutt_get_tmp_attachment(idx[menu->current]->content) == 0) menu->redraw = REDRAW_CURRENT; + /* No send2hook since this doesn't change the message. */ break; case OP_COMPOSE_RENAME_FILE: @@ -1284,7 +1185,8 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ mutt_stamp_attachment(idx[menu->current]->content); } - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; case OP_COMPOSE_NEW_MIME: { @@ -1351,7 +1253,8 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ menu->redraw = REDRAW_FULL; } } - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; case OP_COMPOSE_EDIT_MIME: CHECK_COUNT; @@ -1360,24 +1263,28 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ mutt_update_encoding (idx[menu->current]->content); menu->redraw = REDRAW_FULL; } - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; case OP_VIEW_ATTACH: case OP_DISPLAY_HEADERS: CHECK_COUNT; mutt_attach_display_loop (menu, op, NULL, NULL, NULL, &idx, &idxlen, NULL, 0); menu->redraw = REDRAW_FULL; + /* no send2hook, since this doesn't modify the message */ break; case OP_SAVE: CHECK_COUNT; mutt_save_attachment_list (NULL, menu->tagprefix, menu->tagprefix ? msg->content : idx[menu->current]->content, NULL, menu); MAYBE_REDRAW (menu->redraw); + /* no send2hook, since this doesn't modify the message */ break; case OP_PRINT: CHECK_COUNT; mutt_print_attachment_list (NULL, menu->tagprefix, menu->tagprefix ? msg->content : idx[menu->current]->content); + /* no send2hook, since this doesn't modify the message */ break; case OP_PIPE: @@ -1385,8 +1292,9 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ CHECK_COUNT; mutt_pipe_attachment_list (NULL, menu->tagprefix, menu->tagprefix ? msg->content : idx[menu->current]->content, op == OP_FILTER); if (op == OP_FILTER) /* cte might have changed */ - menu->redraw = menu->tagprefix ? REDRAW_FULL : REDRAW_CURRENT; + menu->redraw = menu->tagprefix ? REDRAW_FULL : REDRAW_CURRENT; menu->redraw |= REDRAW_STATUS; + mutt_message_hook (NULL, msg, M_SEND2HOOK); break; case OP_EXIT: @@ -1479,9 +1387,10 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ } msg->security = 0; } - msg->security = pgp_send_menu (msg, &menu->redraw); + msg->security = crypt_pgp_send_menu (msg, &menu->redraw); redraw_crypt_lines (msg); - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; case OP_FORGET_PASSPHRASE: @@ -1504,15 +1413,17 @@ int mutt_compose_menu (HEADER *msg, /* structure for new message */ } msg->security = 0; } - msg->security = smime_send_menu(msg, &menu->redraw); + msg->security = crypt_smime_send_menu(msg, &menu->redraw); redraw_crypt_lines (msg); - break; + mutt_message_hook (NULL, msg, M_SEND2HOOK); + break; #ifdef MIXMASTER case OP_COMPOSE_MIX: mix_make_chain (&msg->chain, &menu->redraw); + mutt_message_hook (NULL, msg, M_SEND2HOOK); break; #endif diff --git a/config.h.in b/config.h.in index 4d51f94..810dd71 100644 --- a/config.h.in +++ b/config.h.in @@ -470,6 +470,9 @@ /* Define to use fcntl() to lock folders. */ #undef USE_FCNTL +/* Define to sort files in a maildir by inode number. */ +#undef USE_INODESORT + /* Define if you have problems with mutt not detecting new/old mailboxes over NFS. Some NFS implementations incorrectly cache the attributes of small files. */ @@ -500,6 +503,15 @@ /* Sleepycat DB4 Support */ #undef HAVE_DB4 +/* Enable header caching */ +#undef USE_HCACHE + +/* GDBM Support */ +#undef HAVE_GDBM + +/* Sleepycat DB4 Support */ +#undef HAVE_DB4 + /* Define if you have the iconv() function. */ #undef HAVE_ICONV diff --git a/configure b/configure index 3561ac9..b53d42e 100755 --- a/configure +++ b/configure @@ -59,6 +59,8 @@ ac_help="$ac_help --enable-flock Use flock() to lock files" ac_help="$ac_help --disable-fcntl Do NOT use fcntl() to lock files " +ac_help="$ac_help + --disable-inodesort Do NOT read files in maildir folders sorted by inode. " ac_help="$ac_help --disable-warnings Turn off compiler warnings (not recommended)" ac_help="$ac_help @@ -81,6 +83,12 @@ ac_help="$ac_help --without-gdbm Get rid of gdbm even if it is available " ac_help="$ac_help --with-bdb[=DIR] Use BerkeleyDB4 if gdbm is not available " +ac_help="$ac_help + --enable-hcache Enable header caching" +ac_help="$ac_help + --without-gdbm Get rid of gdbm even if it is available " +ac_help="$ac_help + --with-bdb[=DIR] Use BerkeleyDB4 if gdbm is not available " ac_help="$ac_help --disable-iconv Disable iconv support" ac_help="$ac_help @@ -641,7 +649,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:645: checking for a BSD compatible install" >&5 +echo "configure:653: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -694,7 +702,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:698: checking whether build environment is sane" >&5 +echo "configure:706: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -751,7 +759,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:755: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:763: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -797,7 +805,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:801: checking for working aclocal" >&5 +echo "configure:809: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -810,7 +818,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:814: checking for working autoconf" >&5 +echo "configure:822: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -823,7 +831,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:827: checking for working automake" >&5 +echo "configure:835: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -836,7 +844,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:840: checking for working autoheader" >&5 +echo "configure:848: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -849,7 +857,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:853: checking for working makeinfo" >&5 +echo "configure:861: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -874,7 +882,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:878: checking host system type" >&5 +echo "configure:886: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -896,7 +904,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking for prefix""... $ac_c" 1>&6 -echo "configure:900: checking for prefix" >&5 +echo "configure:908: checking for prefix" >&5 if test x$prefix = xNONE; then mutt_cv_prefix=$ac_default_prefix else @@ -907,7 +915,7 @@ echo "$ac_t""$mutt_cv_prefix" 1>&6 # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:911: checking for $ac_word" >&5 +echo "configure:919: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -937,7 +945,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:941: checking for $ac_word" >&5 +echo "configure:949: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -988,7 +996,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:992: checking for $ac_word" >&5 +echo "configure:1000: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1020,7 +1028,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1024: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1032: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1031,12 +1039,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1035 "configure" +#line 1043 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1062,12 +1070,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1066: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1074: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1071: checking whether we are using GNU C" >&5 +echo "configure:1079: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1076,7 +1084,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1095,7 +1103,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1099: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1107: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1128,7 +1136,7 @@ fi echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:1132: checking for strerror in -lcposix" >&5 +echo "configure:1140: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1136,7 +1144,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1173,7 +1181,7 @@ fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1177: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1185: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1189,7 +1197,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__ do CC="$ac_save_CC $ac_arg" cat > conftest.$ac_ext < #include @@ -1226,7 +1234,7 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ; return 0; } EOF -if { (eval echo configure:1230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_prog_cc_stdc="$ac_arg"; break else @@ -1250,7 +1258,7 @@ case "x$am_cv_prog_cc_stdc" in esac echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1254: checking how to run the C preprocessor" >&5 +echo "configure:1262: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1265,13 +1273,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1282,13 +1290,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1299,13 +1307,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1332,7 +1340,7 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 -echo "configure:1336: checking for function prototypes" >&5 +echo "configure:1344: checking for function prototypes" >&5 if test "$am_cv_prog_cc_stdc" != no; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -1345,12 +1353,12 @@ else U=_ ANSI2KNR=./ansi2knr # Ensure some checks needed by ansi2knr itself. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1349: checking for ANSI C header files" >&5 +echo "configure:1357: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1358,7 +1366,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1362: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1375,7 +1383,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1393,7 +1401,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1414,7 +1422,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1425,7 +1433,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1452,17 +1460,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1456: checking for $ac_hdr" >&5 +echo "configure:1464: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1494,7 +1502,7 @@ if test "x$U" != "x"; then { echo "configure: error: Compiler not ANSI compliant" 1>&2; exit 1; } fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1498: checking how to run the C preprocessor" >&5 +echo "configure:1506: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1509,13 +1517,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1526,13 +1534,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1543,13 +1551,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1574,7 +1582,7 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1578: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1586: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1612,7 +1620,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1616: checking for a BSD compatible install" >&5 +echo "configure:1624: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1667,7 +1675,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1671: checking for $ac_word" >&5 +echo "configure:1679: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1695,7 +1703,7 @@ else fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1699: checking build system type" >&5 +echo "configure:1707: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1721,7 +1729,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1725: checking for $ac_word" >&5 +echo "configure:1733: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1753,7 +1761,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1757: checking for $ac_word" >&5 +echo "configure:1765: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1787,21 +1795,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1791: checking for inline" >&5 +echo "configure:1799: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1827,12 +1835,12 @@ EOF esac echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1831: checking for working const" >&5 +echo "configure:1839: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1905,7 +1913,7 @@ fi # Extract the first word of "dbx", so it can be a program name with args. set dummy dbx; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1909: checking for $ac_word" >&5 +echo "configure:1917: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DBX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1941,7 +1949,7 @@ fi # Extract the first word of "gdb", so it can be a program name with args. set dummy gdb; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1945: checking for $ac_word" >&5 +echo "configure:1953: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GDB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1977,7 +1985,7 @@ fi # Extract the first word of "sdb", so it can be a program name with args. set dummy sdb; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1981: checking for $ac_word" >&5 +echo "configure:1989: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2055,7 +2063,7 @@ ac_aux_path_sendmail=/usr/sbin:/usr/lib # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2059: checking for $ac_word" >&5 +echo "configure:2067: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2115,7 +2123,7 @@ fi EOF PGPAUX_TARGET="pgpring pgpewrap" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o" + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o" fi # Check whether --enable-smime or --disable-smime was given. @@ -2133,7 +2141,7 @@ fi #define CRYPT_BACKEND_CLASSIC_SMIME 1 EOF - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o " + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o" SMIMEAUX_TARGET="smime_keys" fi @@ -2173,7 +2181,7 @@ EOF # Extract the first word of "ispell", so it can be a program name with args. set dummy ispell; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2177: checking for $ac_word" >&5 +echo "configure:2185: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ISPELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2217,7 +2225,7 @@ fi if test "${with_slang+set}" = set; then withval="$with_slang" echo $ac_n "checking if this is a BSD system""... $ac_c" 1>&6 -echo "configure:2221: checking if this is a BSD system" >&5 +echo "configure:2229: checking if this is a BSD system" >&5 if eval "test \"`echo '$''{'mutt_cv_bsdish'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2225,7 +2233,7 @@ else mutt_cv_bsdish=no else cat > conftest.$ac_ext < @@ -2238,7 +2246,7 @@ main () #endif } EOF -if { (eval echo configure:2242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then mutt_cv_bsdish=yes else @@ -2255,7 +2263,7 @@ fi echo "$ac_t""$mutt_cv_bsdish" 1>&6 echo $ac_n "checking for S-Lang""... $ac_c" 1>&6 -echo "configure:2259: checking for S-Lang" >&5 +echo "configure:2267: checking for S-Lang" >&5 if test $withval = yes; then if test -d $srcdir/../slang; then mutt_cv_slang=$srcdir/../slang/src @@ -2287,7 +2295,7 @@ echo "configure:2259: checking for S-Lang" >&5 echo "$ac_t""$mutt_cv_slang" 1>&6 if test $mutt_cv_bsdish = yes; then echo $ac_n "checking for main in -ltermlib""... $ac_c" 1>&6 -echo "configure:2291: checking for main in -ltermlib" >&5 +echo "configure:2299: checking for main in -ltermlib" >&5 ac_lib_var=`echo termlib'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2295,14 +2303,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermlib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2342,7 +2350,7 @@ EOF echo $ac_n "checking for SLtt_get_terminfo in -lslang""... $ac_c" 1>&6 -echo "configure:2346: checking for SLtt_get_terminfo in -lslang" >&5 +echo "configure:2354: checking for SLtt_get_terminfo in -lslang" >&5 ac_lib_var=`echo slang'_'SLtt_get_terminfo | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2350,7 +2358,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lslang -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2400,12 +2408,12 @@ fi echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:2404: checking for initscr" >&5 +echo "configure:2412: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -2450,7 +2458,7 @@ else for lib in ncurses ncursesw do echo $ac_n "checking for waddnwstr in -l$lib""... $ac_c" 1>&6 -echo "configure:2454: checking for waddnwstr in -l$lib" >&5 +echo "configure:2462: checking for waddnwstr in -l$lib" >&5 ac_lib_var=`echo $lib'_'waddnwstr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2458,7 +2466,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2491,7 +2499,7 @@ fi done echo $ac_n "checking for initscr in -l$cf_ncurses""... $ac_c" 1>&6 -echo "configure:2495: checking for initscr in -l$cf_ncurses" >&5 +echo "configure:2503: checking for initscr in -l$cf_ncurses" >&5 ac_lib_var=`echo $cf_ncurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2499,7 +2507,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_ncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2535,17 +2543,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2539: checking for $ac_hdr" >&5 +echo "configure:2547: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2576,17 +2584,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2580: checking for $ac_hdr" >&5 +echo "configure:2588: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2617,12 +2625,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:2621: checking for initscr" >&5 +echo "configure:2629: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_initscr=yes" else @@ -2666,7 +2674,7 @@ else case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:2670: checking for tgoto in -lmytinfo" >&5 +echo "configure:2678: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2674,7 +2682,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2708,7 +2716,7 @@ fi ;; hpux10.*|hpux11.*) echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:2712: checking for initscr in -lcur_colr" >&5 +echo "configure:2720: checking for initscr in -lcur_colr" >&5 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2716,7 +2724,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2751,7 +2759,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:2755: checking for initscr in -lHcurses" >&5 +echo "configure:2763: checking for initscr in -lHcurses" >&5 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2759,7 +2767,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2819,12 +2827,12 @@ if test ".$ac_cv_func_initscr" != .yes ; then # Check for library containing tgoto. Do this before curses library # because it may be needed to link the test-case for initscr. echo $ac_n "checking for tgoto""... $ac_c" 1>&6 -echo "configure:2823: checking for tgoto" >&5 +echo "configure:2831: checking for tgoto" >&5 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_tgoto=yes" else @@ -2868,7 +2876,7 @@ else for cf_term_lib in termcap termlib unknown do echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:2872: checking for tgoto in -l$cf_term_lib" >&5 +echo "configure:2880: checking for tgoto in -l$cf_term_lib" >&5 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2876,7 +2884,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2917,7 +2925,7 @@ fi for cf_curs_lib in cursesX curses ncurses xcurses jcurses unknown do echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 -echo "configure:2921: checking for initscr in -l$cf_curs_lib" >&5 +echo "configure:2929: checking for initscr in -l$cf_curs_lib" >&5 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2925,7 +2933,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2962,16 +2970,16 @@ fi LIBS="-l$cf_curs_lib $cf_save_LIBS" if test "$cf_term_lib" = unknown ; then echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 -echo "configure:2966: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:2974: checking if we can link with $cf_curs_lib library" >&5 cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:2975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -2985,16 +2993,16 @@ rm -f conftest* test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; } elif test "$cf_term_lib" != predefined ; then echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 -echo "configure:2989: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 +echo "configure:2997: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 cat > conftest.$ac_ext < int main() { initscr(); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=no else @@ -3004,14 +3012,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:3015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cf_result=yes else @@ -3043,12 +3051,12 @@ fi do echo $ac_n "checking for $ac_func declaration""... $ac_c" 1>&6 -echo "configure:3047: checking for $ac_func declaration" >&5 +echo "configure:3055: checking for $ac_func declaration" >&5 if eval "test \"`echo '$''{'ac_cv_func_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -3057,11 +3065,11 @@ extern int ${ac_func}(); #endif ; return 0; } EOF -if { (eval echo configure:3061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext < int main() { @@ -3070,7 +3078,7 @@ int (*p)() = ${ac_func}; #endif ; return 0; } EOF -if { (eval echo configure:3074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_func_decl_$ac_func=yes" @@ -3122,12 +3130,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:3126: checking for ANSI C header files" >&5 +echo "configure:3134: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3135,7 +3143,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3152,7 +3160,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3170,7 +3178,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -3191,7 +3199,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -3202,7 +3210,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:3206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3230,17 +3238,17 @@ for ac_hdr in stdarg.h sys/ioctl.h ioctl.h sysexits.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3234: checking for $ac_hdr" >&5 +echo "configure:3242: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3252: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3270,17 +3278,17 @@ for ac_hdr in sys/time.h sys/resource.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3274: checking for $ac_hdr" >&5 +echo "configure:3282: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3310,17 +3318,17 @@ for ac_hdr in unix.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3314: checking for $ac_hdr" >&5 +echo "configure:3322: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3350,12 +3358,12 @@ done for ac_func in setrlimit getsid isctype do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3354: checking for $ac_func" >&5 +echo "configure:3362: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3404,12 +3412,12 @@ done echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3408: checking return type of signal handlers" >&5 +echo "configure:3416: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3426,7 +3434,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3446,9 +3454,9 @@ EOF echo $ac_n "checking for sig_atomic_t in signal.h""... $ac_c" 1>&6 -echo "configure:3450: checking for sig_atomic_t in signal.h" >&5 +echo "configure:3458: checking for sig_atomic_t in signal.h" >&5 cat > conftest.$ac_ext < EOF @@ -3458,7 +3466,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ac_cv_type_sig_atomic_t=yes; cat > conftest.$ac_ext < EOF @@ -3484,12 +3492,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sig_atomic_t""... $ac_c" 1>&6 -echo "configure:3488: checking for sig_atomic_t" >&5 +echo "configure:3496: checking for sig_atomic_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_sig_atomic_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3535,12 +3543,12 @@ EOF fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:3539: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:3547: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3552,7 +3560,7 @@ int main() { char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:3556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -3574,14 +3582,14 @@ fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3578: checking whether byte ordering is bigendian" >&5 +echo "configure:3586: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -3592,11 +3600,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -3607,7 +3615,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3627,7 +3635,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3667,17 +3675,17 @@ for ac_hdr in inttypes.h stdint.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3671: checking for $ac_hdr" >&5 +echo "configure:3679: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3704,9 +3712,9 @@ fi done echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 -echo "configure:3708: checking for uint32_t" >&5 +echo "configure:3716: checking for uint32_t" >&5 cat > conftest.$ac_ext < @@ -3725,7 +3733,7 @@ if (sizeof (uint32_t)) ; return 0; } EOF -if { (eval echo configure:3729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF @@ -3743,7 +3751,7 @@ else fi rm -f conftest* echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:3747: checking size of int" >&5 +echo "configure:3755: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3751,7 +3759,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -3763,7 +3771,7 @@ main() exit(0); } EOF -if { (eval echo configure:3767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -3783,7 +3791,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:3787: checking size of long" >&5 +echo "configure:3795: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3791,7 +3799,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include @@ -3803,7 +3811,7 @@ main() exit(0); } EOF -if { (eval echo configure:3807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -3824,12 +3832,12 @@ EOF echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3828: checking for pid_t" >&5 +echo "configure:3836: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3860,12 +3868,12 @@ fi for ac_func in fgetpos memmove setegid srand48 strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3864: checking for $ac_func" >&5 +echo "configure:3872: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3916,12 +3924,12 @@ done for ac_func in strcasecmp strdup do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3920: checking for $ac_func" >&5 +echo "configure:3928: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3972,12 +3980,12 @@ done echo $ac_n "checking for getopt""... $ac_c" 1>&6 -echo "configure:3976: checking for getopt" >&5 +echo "configure:3984: checking for getopt" >&5 if eval "test \"`echo '$''{'ac_cv_func_getopt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getopt=yes" else @@ -4024,17 +4032,17 @@ if test $ac_cv_func_getopt = yes; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4028: checking for $ac_hdr" >&5 +echo "configure:4036: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4067,12 +4075,12 @@ SNPRINTFOBJS="" for ac_func in snprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4071: checking for $ac_func" >&5 +echo "configure:4079: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4123,12 +4131,12 @@ done for ac_func in vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4127: checking for $ac_func" >&5 +echo "configure:4135: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4183,12 +4191,12 @@ fi for ac_func in ftruncate do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4187: checking for $ac_func" >&5 +echo "configure:4195: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4233,7 +4241,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for chsize in -lx""... $ac_c" 1>&6 -echo "configure:4237: checking for chsize in -lx" >&5 +echo "configure:4245: checking for chsize in -lx" >&5 ac_lib_var=`echo x'_'chsize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4241,7 +4249,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4286,12 +4294,12 @@ done for ac_func in strftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4290: checking for $ac_func" >&5 +echo "configure:4298: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4336,7 +4344,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:4340: checking for strftime in -lintl" >&5 +echo "configure:4348: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4344,7 +4352,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4389,12 +4397,12 @@ done for ac_func in fchdir do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4393: checking for $ac_func" >&5 +echo "configure:4401: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4451,12 +4459,12 @@ else for ac_func in regcomp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4455: checking for $ac_func" >&5 +echo "configure:4463: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4509,7 +4517,7 @@ fi if test $mutt_cv_regex = no ; then echo $ac_n "checking whether your system's regexp library is completely broken""... $ac_c" 1>&6 -echo "configure:4513: checking whether your system's regexp library is completely broken" >&5 +echo "configure:4521: checking whether your system's regexp library is completely broken" >&5 if eval "test \"`echo '$''{'mutt_cv_regex_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4517,14 +4525,14 @@ else mutt_cv_regex_broken=yes else cat > conftest.$ac_ext < #include main() { regex_t blah ; regmatch_t p; p.rm_eo = p.rm_eo; return regcomp(&blah, "foo.*bar", REG_NOSUB) || regexec (&blah, "foobar", 0, NULL, 0); } EOF -if { (eval echo configure:4528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then mutt_cv_regex_broken=no else @@ -4584,7 +4592,7 @@ if test "${with_mailpath+set}" = set; then mutt_cv_mailpath=$withval else echo $ac_n "checking where new mail is stored""... $ac_c" 1>&6 -echo "configure:4588: checking where new mail is stored" >&5 +echo "configure:4596: checking where new mail is stored" >&5 if eval "test \"`echo '$''{'mutt_cv_mailpath'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4613,7 +4621,7 @@ EOF echo $ac_n "checking if $mutt_cv_mailpath is world writable""... $ac_c" 1>&6 -echo "configure:4617: checking if $mutt_cv_mailpath is world writable" >&5 +echo "configure:4625: checking if $mutt_cv_mailpath is world writable" >&5 if eval "test \"`echo '$''{'mutt_cv_worldwrite'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4621,7 +4629,7 @@ else mutt_cv_worldwrite=no else cat > conftest.$ac_ext < #include @@ -4635,7 +4643,7 @@ int main (int argc, char **argv) exit (1); } EOF -if { (eval echo configure:4639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then mutt_cv_worldwrite=yes else @@ -4660,7 +4668,7 @@ EOF else echo $ac_n "checking if $mutt_cv_mailpath is group writable""... $ac_c" 1>&6 -echo "configure:4664: checking if $mutt_cv_mailpath is group writable" >&5 +echo "configure:4672: checking if $mutt_cv_mailpath is group writable" >&5 if eval "test \"`echo '$''{'mutt_cv_groupwrite'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4668,7 +4676,7 @@ else mutt_cv_groupwrite=no else cat > conftest.$ac_ext < #include @@ -4682,7 +4690,7 @@ int main (int argc, char **argv) exit (1); } EOF -if { (eval echo configure:4686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then mutt_cv_groupwrite=yes else @@ -4735,7 +4743,7 @@ fi echo $ac_n "checking where to put the documentation""... $ac_c" 1>&6 -echo "configure:4739: checking where to put the documentation" >&5 +echo "configure:4747: checking where to put the documentation" >&5 # Check whether --with-docdir or --without-docdir was given. if test "${with_docdir+set}" = set; then withval="$with_docdir" @@ -4837,9 +4845,9 @@ fi if test "$need_socket" = "yes" then echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:4841: checking for socklen_t" >&5 +echo "configure:4849: checking for socklen_t" >&5 cat > conftest.$ac_ext < EOF @@ -4858,12 +4866,12 @@ fi rm -f conftest* echo $ac_n "checking for gethostent""... $ac_c" 1>&6 -echo "configure:4862: checking for gethostent" >&5 +echo "configure:4870: checking for gethostent" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostent'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostent=yes" else @@ -4904,7 +4912,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostent`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostent in -lnsl""... $ac_c" 1>&6 -echo "configure:4908: checking for gethostent in -lnsl" >&5 +echo "configure:4916: checking for gethostent in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4912,7 +4920,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4953,12 +4961,12 @@ fi fi echo $ac_n "checking for setsockopt""... $ac_c" 1>&6 -echo "configure:4957: checking for setsockopt" >&5 +echo "configure:4965: checking for setsockopt" >&5 if eval "test \"`echo '$''{'ac_cv_func_setsockopt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setsockopt=yes" else @@ -4999,7 +5007,7 @@ if eval "test \"`echo '$ac_cv_func_'setsockopt`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for setsockopt in -lsocket""... $ac_c" 1>&6 -echo "configure:5003: checking for setsockopt in -lsocket" >&5 +echo "configure:5011: checking for setsockopt in -lsocket" >&5 ac_lib_var=`echo socket'_'setsockopt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5007,7 +5015,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5050,12 +5058,12 @@ fi for ac_func in getaddrinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5054: checking for $ac_func" >&5 +echo "configure:5062: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5137,7 +5145,7 @@ then # Extract the first word of "krb5-config", so it can be a program name with args. set dummy krb5-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5141: checking for $ac_word" >&5 +echo "configure:5149: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_KRB5CFGPATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5189,7 +5197,7 @@ fi fi echo $ac_n "checking for gss_init_sec_context in -lgssapi_krb5""... $ac_c" 1>&6 -echo "configure:5193: checking for gss_init_sec_context in -lgssapi_krb5" >&5 +echo "configure:5201: checking for gss_init_sec_context in -lgssapi_krb5" >&5 ac_lib_var=`echo gssapi_krb5'_'gss_init_sec_context | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5197,7 +5205,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5235,7 +5243,7 @@ fi if test "$GSSAPI_IMPL" = "none" then echo $ac_n "checking for gss_init_sec_context in -lgssapi""... $ac_c" 1>&6 -echo "configure:5239: checking for gss_init_sec_context in -lgssapi" >&5 +echo "configure:5247: checking for gss_init_sec_context in -lgssapi" >&5 ac_lib_var=`echo gssapi'_'gss_init_sec_context | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5243,7 +5251,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgssapi -lkrb5 -ldes -lasn1 -lroken -lcrypt -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5283,7 +5291,7 @@ fi if test "$GSSAPI_IMPL" = "none" then echo $ac_n "checking for g_order_init in -lgssapi_krb5""... $ac_c" 1>&6 -echo "configure:5287: checking for g_order_init in -lgssapi_krb5" >&5 +echo "configure:5295: checking for g_order_init in -lgssapi_krb5" >&5 ac_lib_var=`echo gssapi_krb5'_'g_order_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5291,7 +5299,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgssapi_krb5 -lkrb5 -lcrypto -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5333,7 +5341,7 @@ fi LIBS="$saved_LIBS" echo $ac_n "checking GSSAPI implementation""... $ac_c" 1>&6 -echo "configure:5337: checking GSSAPI implementation" >&5 +echo "configure:5345: checking GSSAPI implementation" >&5 echo "$ac_t""$GSSAPI_IMPL" 1>&6 if test "$GSSAPI_IMPL" = "none" then @@ -5432,7 +5440,7 @@ if test "${with_ssl+set}" = set; then saved_LIBS="$LIBS" echo $ac_n "checking for X509_new in -lcrypto""... $ac_c" 1>&6 -echo "configure:5436: checking for X509_new in -lcrypto" >&5 +echo "configure:5444: checking for X509_new in -lcrypto" >&5 ac_lib_var=`echo crypto'_'X509_new | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5440,7 +5448,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5480,7 +5488,7 @@ else fi echo $ac_n "checking for SSL_new in -lssl""... $ac_c" 1>&6 -echo "configure:5484: checking for SSL_new in -lssl" >&5 +echo "configure:5492: checking for SSL_new in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_new | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5488,7 +5496,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl -lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5531,12 +5539,12 @@ fi for ac_func in RAND_status RAND_egd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5535: checking for $ac_func" >&5 +echo "configure:5543: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5627,7 +5635,7 @@ if test "${with_gnutls+set}" = set; then #saved_LIBS="$LIBS" echo $ac_n "checking for gnutls_init in -lgnutls""... $ac_c" 1>&6 -echo "configure:5631: checking for gnutls_init in -lgnutls" >&5 +echo "configure:5639: checking for gnutls_init in -lgnutls" >&5 ac_lib_var=`echo gnutls'_'gnutls_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5635,7 +5643,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgnutls $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5747,7 +5755,7 @@ if test "${with_sasl+set}" = set; then saved_LIBS="$LIBS" echo $ac_n "checking for sasl_client_init in -lsasl""... $ac_c" 1>&6 -echo "configure:5751: checking for sasl_client_init in -lsasl" >&5 +echo "configure:5759: checking for sasl_client_init in -lsasl" >&5 ac_lib_var=`echo sasl'_'sasl_client_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5755,7 +5763,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsasl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5837,7 +5845,7 @@ if test "${with_sasl2+set}" = set; then saved_LIBS="$LIBS" echo $ac_n "checking for sasl_client_init in -lsasl2""... $ac_c" 1>&6 -echo "configure:5841: checking for sasl_client_init in -lsasl2" >&5 +echo "configure:5849: checking for sasl_client_init in -lsasl2" >&5 ac_lib_var=`echo sasl2'_'sasl_client_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5845,7 +5853,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsasl2 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5928,7 +5936,7 @@ fi if test "x$with_idn" != "xno"; then echo $ac_n "checking for stringprep_check_version in -lidn""... $ac_c" 1>&6 -echo "configure:5932: checking for stringprep_check_version in -lidn" >&5 +echo "configure:5940: checking for stringprep_check_version in -lidn" >&5 ac_lib_var=`echo idn'_'stringprep_check_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5936,7 +5944,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidn $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5977,12 +5985,12 @@ fi for ac_func in idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5981: checking for $ac_func" >&5 +echo "configure:5989: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6032,12 +6040,12 @@ done for ac_func in idna_to_ascii_from_utf8 idna_to_ascii_8z do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6036: checking for $ac_func" >&5 +echo "configure:6044: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6087,12 +6095,12 @@ done for ac_func in idna_to_ascii_lz idna_to_ascii_from_locale do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6091: checking for $ac_func" >&5 +echo "configure:6099: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6182,6 +6190,21 @@ EOF fi +mutt_cv_inodesort=yes +# Check whether --enable-inodesort or --disable-inodesort was given. +if test "${enable_inodesort+set}" = set; then + enableval="$enable_inodesort" + if test $enableval = no ; then mutt_cv_inodesort=no; fi +fi + + +if test $mutt_cv_inodesort = yes; then + cat >> confdefs.h <<\EOF +#define USE_INODESORT 1 +EOF + +fi + mutt_cv_warnings=yes # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then @@ -6315,21 +6338,21 @@ fi CPPFLAGS="$OLDCPPFLAGS" LIBS="$OLDLIBS -lgdbm"; echo $ac_n "checking for gdbm_open""... $ac_c" 1>&6 -echo "configure:6319: checking for gdbm_open" >&5 +echo "configure:6342: checking for gdbm_open" >&5 if eval "test \"`echo '$''{'ac_cv_gdbmopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_gdbmopen=no cat > conftest.$ac_ext < int main() { gdbm_open(0,0,0,0,0); ; return 0; } EOF -if { (eval echo configure:6333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_gdbmopen=yes else @@ -6360,7 +6383,7 @@ fi done BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" echo $ac_n "checking for BerkeleyDB > 4.0""... $ac_c" 1>&6 -echo "configure:6364: checking for BerkeleyDB > 4.0" >&5 +echo "configure:6387: checking for BerkeleyDB > 4.0" >&5 for d in $bdbpfx; do BDB_INCLUDE_DIR="" BDB_LIB_DIR="" @@ -6373,7 +6396,7 @@ echo "configure:6364: checking for BerkeleyDB > 4.0" >&5 CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS" LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$l" cat > conftest.$ac_ext < @@ -6386,7 +6409,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_dbcreate=yes @@ -6433,11 +6456,148 @@ fi fi -if test "$need_md5" = "yes" -then - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5c.o" +# Check whether --enable-hcache or --disable-hcache was given. +if test "${enable_hcache+set}" = set; then + enableval="$enable_hcache" + if test x$enableval = xyes; then + cat >> confdefs.h <<\EOF +#define USE_HCACHE 1 +EOF + + + OLDCPPFLAGS="$CPPFLAGS" + OLDLIBS="$LIBS" + + need_md5="yes" + ac_prefer_gdbm=yes + # Check whether --with-gdbm or --without-gdbm was given. +if test "${with_gdbm+set}" = set; then + withval="$with_gdbm" + ac_prefer_gdbm=$withval fi + if test x$ac_prefer_gdbm != xno; then + CPPFLAGS="$OLDCPPFLAGS" + LIBS="$OLDLIBS -lgdbm"; + echo $ac_n "checking for gdbm_open""... $ac_c" 1>&6 +echo "configure:6484: checking for gdbm_open" >&5 +if eval "test \"`echo '$''{'ac_cv_gdbmopen'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + ac_cv_gdbmopen=no + cat > conftest.$ac_ext < +int main() { +gdbm_open(0,0,0,0,0); +; return 0; } +EOF +if { (eval echo configure:6498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cv_gdbmopen=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_gdbmopen" 1>&6 + fi + + ac_bdb_prefix=yes + # Check whether --with-bdb or --without-bdb was given. +if test "${with_bdb+set}" = set; then + withval="$with_bdb" + ac_bdb_prefix=$withval +fi + + if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes; then + test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" + for d in $ac_bdb_prefix; do + bdbpfx="$bdbpfx $d" + for v in BerkeleyDB.4.3 BerkeleyDB.4.2 BerkeleyDB.4.1; do + bdbpfx="$bdbpfx $d/$v" + done + done + BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" + echo $ac_n "checking for BerkeleyDB > 4.0""... $ac_c" 1>&6 +echo "configure:6529: checking for BerkeleyDB > 4.0" >&5 + for d in $bdbpfx; do + BDB_INCLUDE_DIR="" + BDB_LIB_DIR="" + for v in / $BDB_VERSIONS; do + if test -r "$d/include/$v/db.h"; then + BDB_INCLUDE_DIR="$d/include/$v" + if test -d "$d/lib/$v"; then + BDB_LIB_DIR="$d/lib/$v" + for l in `echo $BDB_VERSIONS`; do + CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS" + LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$l" + cat > conftest.$ac_ext < + #include + +int main() { + + DB *db = NULL; + db->open(db,NULL,NULL,NULL,0,0,0); + +; return 0; } +EOF +if { (eval echo configure:6555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + ac_cv_dbcreate=yes + BDB_LIB="$l" + break + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + done + test x$ac_dbcreate = xyes && break + fi + fi + done + test x$BDB_LIB != x && break + done + if test x$ac_cv_dbcreate = xyes; then + echo "$ac_t""yes" 1>&6 + else + echo "$ac_t""no" 1>&6 + fi + fi + + if test x$ac_cv_gdbmopen = xyes; then + CPPFLAGS="$OLDCPPFLAGS" + LIBS="$OLDLIBS -lgdbm"; + cat >> confdefs.h <<\EOF +#define HAVE_GDBM 1 +EOF + + elif test x$ac_cv_dbcreate = xyes; then + CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS" + LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB" + cat >> confdefs.h <<\EOF +#define HAVE_DB4 1 +EOF + + else + { echo "configure: error: You need Sleepycat DB4 or GDBM for --enable-hcache" 1>&2; exit 1; } + fi +fi +fi + + @@ -6455,12 +6615,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:6459: checking for off_t" >&5 +echo "configure:6619: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6488,12 +6648,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:6492: checking for size_t" >&5 +echo "configure:6652: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6523,19 +6683,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:6527: checking for working alloca.h" >&5 +echo "configure:6687: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:6539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -6556,12 +6716,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:6560: checking for alloca" >&5 +echo "configure:6720: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -6621,12 +6781,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:6625: checking whether alloca needs Cray hooks" >&5 +echo "configure:6785: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6655: checking for $ac_func" >&5 +echo "configure:6815: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6706,7 +6866,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:6710: checking stack direction for C alloca" >&5 +echo "configure:6870: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6714,7 +6874,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -6758,17 +6918,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6762: checking for $ac_hdr" >&5 +echo "configure:6922: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6932: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6797,12 +6957,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6801: checking for $ac_func" >&5 +echo "configure:6961: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6850,7 +7010,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:6854: checking for working mmap" >&5 +echo "configure:7014: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6858,7 +7018,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -7022,12 +7182,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:7026: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:7186: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -7063,17 +7223,17 @@ stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7067: checking for $ac_hdr" >&5 +echo "configure:7227: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7104,12 +7264,12 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7108: checking for $ac_func" >&5 +echo "configure:7268: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7172,7 +7332,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:7176: checking for iconv" >&5 +echo "configure:7336: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7180,7 +7340,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext < #include @@ -7190,7 +7350,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:7194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -7202,7 +7362,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat > conftest.$ac_ext < #include @@ -7212,7 +7372,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:7216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -7233,13 +7393,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:7237: checking for iconv declaration" >&5 +echo "configure:7397: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -7258,7 +7418,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -7287,19 +7447,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:7291: checking for nl_langinfo and CODESET" >&5 +echo "configure:7451: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:7303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -7322,19 +7482,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:7326: checking for LC_MESSAGES" >&5 +echo "configure:7486: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:7338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -7355,7 +7515,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:7359: checking whether NLS is requested" >&5 +echo "configure:7519: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -7377,7 +7537,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:7381: checking whether included gettext is requested" >&5 +echo "configure:7541: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -7397,17 +7557,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:7401: checking for libintl.h" >&5 +echo "configure:7561: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7424,12 +7584,12 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:7428: checking for GNU gettext in libc" >&5 +echo "configure:7588: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -7438,7 +7598,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:7442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libc=yes else @@ -7454,14 +7614,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6 if test "$gt_cv_func_gnugettext1_libc" != "yes"; then echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:7458: checking for GNU gettext in libintl" >&5 +echo "configure:7618: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl $LIBICONV" cat > conftest.$ac_ext < extern int _nl_msg_cat_cntr; @@ -7470,7 +7630,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:7474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libintl=yes else @@ -7503,12 +7663,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7507: checking for $ac_func" >&5 +echo "configure:7667: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7560,7 +7720,7 @@ done # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7564: checking for $ac_word" >&5 +echo "configure:7724: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7594,7 +7754,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7598: checking for $ac_word" >&5 +echo "configure:7758: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7631,7 +7791,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7635: checking for $ac_word" >&5 +echo "configure:7795: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7681,7 +7841,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7685: checking for $ac_word" >&5 +echo "configure:7845: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7715,7 +7875,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7719: checking for $ac_word" >&5 +echo "configure:7879: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7751,7 +7911,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7755: checking for $ac_word" >&5 +echo "configure:7915: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7822,7 +7982,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7826: checking for $ac_word" >&5 +echo "configure:7986: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7855,7 +8015,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:7859: checking version of bison" >&5 +echo "configure:8019: checking version of bison" >&5 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -7902,7 +8062,7 @@ echo "configure:7859: checking version of bison" >&5 LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:7906: checking for catalogs to be installed" >&5 +echo "configure:8066: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -7951,17 +8111,17 @@ for ac_hdr in iconv.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7955: checking for $ac_hdr" >&5 +echo "configure:8115: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7982,9 +8142,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then #define $ac_tr_hdr 1 EOF echo $ac_n "checking whether iconv.h defines iconv_t""... $ac_c" 1>&6 -echo "configure:7986: checking whether iconv.h defines iconv_t" >&5 +echo "configure:8146: checking whether iconv.h defines iconv_t" >&5 cat > conftest.$ac_ext < EOF @@ -8009,7 +8169,7 @@ done echo $ac_n "checking whether this iconv is good enough""... $ac_c" 1>&6 -echo "configure:8013: checking whether this iconv is good enough" >&5 +echo "configure:8173: checking whether this iconv is good enough" >&5 if eval "test \"`echo '$''{'mutt_cv_iconv_good'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8019,7 +8179,7 @@ else mutt_cv_iconv_good=yes else cat > conftest.$ac_ext < @@ -8037,7 +8197,7 @@ int main() } EOF -if { (eval echo configure:8041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then mutt_cv_iconv_good=yes else @@ -8058,7 +8218,7 @@ if test "$mutt_cv_iconv_good" = no; then fi echo $ac_n "checking whether iconv is non-transcribing""... $ac_c" 1>&6 -echo "configure:8062: checking whether iconv is non-transcribing" >&5 +echo "configure:8222: checking whether iconv is non-transcribing" >&5 if eval "test \"`echo '$''{'mutt_cv_iconv_nontrans'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8068,7 +8228,7 @@ else mutt_cv_iconv_nontrans=no else cat > conftest.$ac_ext < @@ -8087,7 +8247,7 @@ int main() } EOF -if { (eval echo configure:8091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then mutt_cv_iconv_nontrans=no else @@ -8126,12 +8286,12 @@ else for ac_func in bind_textdomain_codeset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8130: checking for $ac_func" >&5 +echo "configure:8290: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8187,17 +8347,17 @@ for ac_hdr in wchar.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8191: checking for $ac_hdr" >&5 +echo "configure:8351: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8225,12 +8385,12 @@ done echo $ac_n "checking for wchar_t""... $ac_c" 1>&6 -echo "configure:8229: checking for wchar_t" >&5 +echo "configure:8389: checking for wchar_t" >&5 if eval "test \"`echo '$''{'mutt_cv_wchar_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -8243,7 +8403,7 @@ int main() { wchar_t wc; return 0; ; return 0; } EOF -if { (eval echo configure:8247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mutt_cv_wchar_t=yes else @@ -8265,12 +8425,12 @@ EOF fi echo $ac_n "checking for wint_t""... $ac_c" 1>&6 -echo "configure:8269: checking for wint_t" >&5 +echo "configure:8429: checking for wint_t" >&5 if eval "test \"`echo '$''{'mutt_cv_wint_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -8283,7 +8443,7 @@ int main() { wint_t wc; return 0; ; return 0; } EOF -if { (eval echo configure:8287: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mutt_cv_wint_t=yes else @@ -8308,17 +8468,17 @@ for ac_hdr in wctype.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8312: checking for $ac_hdr" >&5 +echo "configure:8472: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8347,12 +8507,12 @@ done for ac_func in iswalnum iswalpha iswcntrl iswdigit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8351: checking for $ac_func" >&5 +echo "configure:8511: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8402,12 +8562,12 @@ done for ac_func in iswgraph iswlower iswprint iswpunct iswspace iswupper do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8406: checking for $ac_func" >&5 +echo "configure:8566: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8457,12 +8617,12 @@ done for ac_func in iswxdigit towupper towlower do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8461: checking for $ac_func" >&5 +echo "configure:8621: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8511,12 +8671,12 @@ done echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:8515: checking for mbstate_t" >&5 +echo "configure:8675: checking for mbstate_t" >&5 if eval "test \"`echo '$''{'mutt_cv_mbstate_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -8529,7 +8689,7 @@ int main() { mbstate_t s; return 0; ; return 0; } EOF -if { (eval echo configure:8533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* mutt_cv_mbstate_t=yes else @@ -8560,13 +8720,13 @@ fi if test "$wc_funcs" != yes -a "$wc_funcs" != no; then echo $ac_n "checking for wchar_t functions""... $ac_c" 1>&6 -echo "configure:8564: checking for wchar_t functions" >&5 +echo "configure:8724: checking for wchar_t functions" >&5 if eval "test \"`echo '$''{'mutt_cv_wc_funcs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else mutt_cv_wc_funcs=no cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* mutt_cv_wc_funcs=yes else @@ -8605,19 +8765,19 @@ EOF fi echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:8609: checking for nl_langinfo and CODESET" >&5 +echo "configure:8769: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'mutt_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:8621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* mutt_cv_langinfo_codeset=yes else @@ -8638,19 +8798,19 @@ EOF fi echo $ac_n "checking for nl_langinfo and YESEXPR""... $ac_c" 1>&6 -echo "configure:8642: checking for nl_langinfo and YESEXPR" >&5 +echo "configure:8802: checking for nl_langinfo and YESEXPR" >&5 if eval "test \"`echo '$''{'mutt_cv_langinfo_yesexpr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(YESEXPR); ; return 0; } EOF -if { (eval echo configure:8654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* mutt_cv_langinfo_yesexpr=yes else @@ -8686,7 +8846,7 @@ if test "${with_libesmtp+set}" = set; then # Extract the first word of "libesmtp-config", so it can be a program name with args. set dummy libesmtp-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8690: checking for $ac_word" >&5 +echo "configure:8850: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_mutt_libesmtp_config_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8732,17 +8892,17 @@ fi CFLAGS="$CFLAGS $mutt_libesmtp_cflags" ac_safe=`echo "libesmtp.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libesmtp.h""... $ac_c" 1>&6 -echo "configure:8736: checking for libesmtp.h" >&5 +echo "configure:8896: checking for libesmtp.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8906: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8771,7 +8931,7 @@ fi CFLAGS="$CFLAGS $mutt_libesmtp_cflags" LIBS="$LIBS $mutt_libesmtp_libs" echo $ac_n "checking for smtp_create_session in -lesmtp""... $ac_c" 1>&6 -echo "configure:8775: checking for smtp_create_session in -lesmtp" >&5 +echo "configure:8935: checking for smtp_create_session in -lesmtp" >&5 ac_lib_var=`echo esmtp'_'smtp_create_session | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8779,7 +8939,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lesmtp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/configure.in b/configure.in index f37a389..b70d554 100644 --- a/configure.in +++ b/configure.in @@ -11,6 +11,7 @@ mutt_cv_version=`cat $srcdir/VERSION` AM_INIT_AUTOMAKE(muttng, $mutt_cv_version) +dnl AC_GNU_SOURCE ifdef([AC_LIBOBJ], , [define([AC_LIBOBJ], [LIB[]OBJS="$LIBOBJS $1.o"])]) @@ -105,7 +106,7 @@ else AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP,1, [ Define if you want classic PGP support. ]) PGPAUX_TARGET="pgpring pgpewrap" - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o" + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS pgp.o pgpinvoke.o pgpkey.o pgplib.o gnupgparse.o pgpmicalg.o pgppacket.o crypt-mod-pgp-classic.o" fi AC_ARG_ENABLE(smime, [ --disable-smime Disable SMIME support], @@ -117,7 +118,7 @@ else if test x$have_smime != xno ; then AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME,1, [ Define if you want clasic S/MIME support. ]) - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o " + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS smime.o crypt-mod-smime-classic.o" SMIMEAUX_TARGET="smime_keys" fi @@ -325,6 +326,7 @@ AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) AC_TYPE_PID_T +dnl AC_CHECK_TYPE(ssize_t, int) AC_CHECK_FUNCS(fgetpos memmove setegid srand48 strerror) @@ -750,6 +752,14 @@ if test $mutt_cv_fcntl = yes; then AC_DEFINE(USE_FCNTL,1, [ Define to use fcntl() to lock folders. ]) fi +mutt_cv_inodesort=yes +AC_ARG_ENABLE(inodesort, [ --disable-inodesort Do NOT read files in maildir folders sorted by inode. ], + [if test $enableval = no ; then mutt_cv_inodesort=no; fi]) + +if test $mutt_cv_inodesort = yes; then + AC_DEFINE(USE_INODESORT, 1, [ Define to sort files in a maildir by inode number. ]) +fi + mutt_cv_warnings=yes AC_ARG_ENABLE(warnings, [ --disable-warnings Turn off compiler warnings (not recommended)], [if test $enableval = no; then @@ -889,10 +899,89 @@ AC_ARG_ENABLE(hcache, [ --enable-hcache Enable header caching], fi]) dnl -- end cache -- -if test "$need_md5" = "yes" -then - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS md5c.o" -fi +dnl -- start cache -- +AC_ARG_ENABLE(hcache, [ --enable-hcache Enable header caching], +[if test x$enableval = xyes; then + AC_DEFINE(USE_HCACHE, 1, [Enable header caching]) + + OLDCPPFLAGS="$CPPFLAGS" + OLDLIBS="$LIBS" + + need_md5="yes" + ac_prefer_gdbm=yes + AC_ARG_WITH(gdbm, [ --without-gdbm Get rid of gdbm even if it is available ], + ac_prefer_gdbm=$withval) + if test x$ac_prefer_gdbm != xno; then + CPPFLAGS="$OLDCPPFLAGS" + LIBS="$OLDLIBS -lgdbm"; + AC_CACHE_CHECK(for gdbm_open, ac_cv_gdbmopen,[ + ac_cv_gdbmopen=no + AC_TRY_LINK([#include ],[gdbm_open(0,0,0,0,0);],[ac_cv_gdbmopen=yes]) + ]) + fi + + ac_bdb_prefix=yes + AC_ARG_WITH(bdb, [ --with-bdb[=DIR] Use BerkeleyDB4 if gdbm is not available ], + ac_bdb_prefix=$withval) + if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes; then + test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" + for d in $ac_bdb_prefix; do + bdbpfx="$bdbpfx $d" + for v in BerkeleyDB.4.3 BerkeleyDB.4.2 BerkeleyDB.4.1; do + bdbpfx="$bdbpfx $d/$v" + done + done + BDB_VERSIONS="db-4 db4 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db ''" + AC_MSG_CHECKING([for BerkeleyDB > 4.0]) + for d in $bdbpfx; do + BDB_INCLUDE_DIR="" + BDB_LIB_DIR="" + for v in / $BDB_VERSIONS; do + if test -r "$d/include/$v/db.h"; then + BDB_INCLUDE_DIR="$d/include/$v" + if test -d "$d/lib/$v"; then + BDB_LIB_DIR="$d/lib/$v" + for l in `echo $BDB_VERSIONS`; do + CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS" + LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$l" + AC_TRY_LINK([ + #include + #include + ],[ + DB *db = NULL; + db->open(db,NULL,NULL,NULL,0,0,0); + ],[ + ac_cv_dbcreate=yes + BDB_LIB="$l" + break + ]) + done + test x$ac_dbcreate = xyes && break + fi + fi + done + test x$BDB_LIB != x && break + done + if test x$ac_cv_dbcreate = xyes; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + fi + + if test x$ac_cv_gdbmopen = xyes; then + CPPFLAGS="$OLDCPPFLAGS" + LIBS="$OLDLIBS -lgdbm"; + AC_DEFINE(HAVE_GDBM, 1, [GDBM Support]) + elif test x$ac_cv_dbcreate = xyes; then + CPPFLAGS="-I$BDB_INCLUDE_DIR $OLDCPPFLAGS" + LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB" + AC_DEFINE(HAVE_DB4, 1, [Sleepycat DB4 Support]) + else + AC_MSG_ERROR(You need Sleepycat DB4 or GDBM for --enable-hcache) + fi +fi]) +dnl -- end cache -- AC_SUBST(MUTTLIBS) AC_SUBST(MUTT_LIB_OBJECTS) diff --git a/contrib/gpg.rc b/contrib/gpg.rc index 8b567ef..41e9ab3 100644 --- a/contrib/gpg.rc +++ b/contrib/gpg.rc @@ -5,7 +5,7 @@ # This version uses gpg-2comp from # http://muppet.faveve.uni-stuttgart.de/~gero/gpg-2comp.tar.gz # -# $Id: gpg.rc,v 3.1 2002/03/26 22:23:58 roessler Exp $ +# $Id: gpg.rc,v 3.4 2005/01/27 18:27:36 roessler Exp $ # # %p The empty string when no passphrase is needed, # the string "PGPPASSFD=0" if one is needed. @@ -31,21 +31,21 @@ # breaking PGP/MIME. # decode application/pgp -set pgp_decode_command="/usr/bin/gpg --charset utf-8 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" +set pgp_decode_command="/usr/bin/gpg --charset utf-8 --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" # verify a pgp/mime signature -set pgp_verify_command="/usr/bin/gpg --no-verbose --quiet --batch --output - --verify %s %f" +set pgp_verify_command="/usr/bin/gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f" # decrypt a pgp/mime attachment -set pgp_decrypt_command="/usr/bin/gpg --passphrase-fd 0 --no-verbose --quiet --batch --output - %f" +set pgp_decrypt_command="/usr/bin/gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f" # create a pgp/mime signed attachment # set pgp_sign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f" -set pgp_sign_command="/usr/bin/gpg --no-verbose --batch --quiet --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f" +set pgp_sign_command="/usr/bin/gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f" # create a application/pgp signed (old-style) message # set pgp_clearsign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f" -set pgp_clearsign_command="/usr/bin/gpg --charset utf-8 --no-verbose --batch --quiet --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f" +set pgp_clearsign_command="/usr/bin/gpg --charset utf-8 --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f" # create a pgp/mime encrypted attachment # set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f" @@ -53,10 +53,10 @@ set pgp_encrypt_only_command="pgpewrap /usr/bin/gpg --charset utf-8 --batch # create a pgp/mime encrypted and signed attachment # set pgp_encrypt_sign_command="pgpewrap gpg-2comp --passphrase-fd 0 -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" -set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg --charset utf-8 --passphrase-fd 0 --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" +set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg --charset utf-8 %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f" # import a key into the public key ring -set pgp_import_command="/usr/bin/gpg --no-verbose --import -v %f" +set pgp_import_command="/usr/bin/gpg --no-verbose --import %f" # export a key from the public key ring set pgp_export_command="/usr/bin/gpg --no-verbose --export --armor %r" @@ -78,5 +78,8 @@ set pgp_list_secring_command="/usr/bin/gpg --no-verbose --batch --quiet --wi # set pgp_good_sign="^gpg: Good signature from" # OK, here's a version which uses gnupg's message catalog: -set pgp_good_sign="`gettext -d gnupg -s 'Good signature from "' | tr -d '"'`" +# set pgp_good_sign="`gettext -d gnupg -s 'Good signature from "' | tr -d '"'`" + +# This version uses --status-fd messages +set pgp_good_sign="^\\[GNUPG:\\] GOODSIG" diff --git a/contrib/sample.muttrc b/contrib/sample.muttrc index 88f9b33..f2799a8 100644 --- a/contrib/sample.muttrc +++ b/contrib/sample.muttrc @@ -1,4 +1,4 @@ -# $Id: sample.muttrc,v 3.3 2003/04/02 08:43:24 roessler Exp $ +# $Id: sample.muttrc,v 3.4 2005/01/27 18:47:57 roessler Exp $ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # @@ -145,7 +145,7 @@ color attachment brightmagenta default color search default green # how to hilite search patterns in the pager color header brightred default ^(From|Subject): -color body magenta default "(ftp|http)://[^ ]+" # point out URLs +color body magenta default "(ftp|http|https)://[^ ]+" # point out URLs color body magenta default [-a-z_0-9.]+@[-a-z_0-9.]+ # e-mail addresses color underline brightgreen default diff --git a/copy.c b/copy.c index 2b76350..f564054 100644 --- a/copy.c +++ b/copy.c @@ -652,6 +652,8 @@ _mutt_copy_message (FILE *fpout, FILE *fpin, HEADER *hdr, BODY *body, s.flags |= M_WEED; if (flags & M_CM_CHARCONV) s.flags |= M_CHARCONV; + if (flags & M_CM_REPLYING) + s.flags |= M_REPLYING; if (WithCrypto && flags & M_CM_VERIFY) s.flags |= M_VERIFY; @@ -972,7 +974,7 @@ static int address_header_decode (char **h) default: return 0; } - if ((a = rfc822_parse_adrlist (a, s + l + 1)) == NULL) + if ((a = rfc822_parse_adrlist (a, s + l)) == NULL) return 0; mutt_addrlist_to_local (a); diff --git a/copy.h b/copy.h index c03d5f8..f0a9b86 100644 --- a/copy.h +++ b/copy.h @@ -25,14 +25,15 @@ #define M_CM_WEED (1<<5) /* weed message/rfc822 attachment headers */ #define M_CM_CHARCONV (1<<6) /* perform character set conversions */ #define M_CM_PRINTING (1<<7) /* printing the message - display light */ +#define M_CM_REPLYING (1<<8) /* replying the message */ -#define M_CM_DECODE_PGP (1<<8) /* used for decoding PGP messages */ -#define M_CM_DECODE_SMIME (1<<9) /* used for decoding S/MIME messages */ +#define M_CM_DECODE_PGP (1<<9) /* used for decoding PGP messages */ +#define M_CM_DECODE_SMIME (1<<10) /* used for decoding S/MIME messages */ #define M_CM_DECODE_CRYPT (M_CM_DECODE_PGP | M_CM_DECODE_SMIME) -#define M_CM_VERIFY (1<<10) /* do signature verification */ +#define M_CM_VERIFY (1<<11) /* do signature verification */ diff --git a/crypt-mod-pgp-classic.c b/crypt-mod-pgp-classic.c new file mode 100644 index 0000000..083a82f --- /dev/null +++ b/crypt-mod-pgp-classic.c @@ -0,0 +1,132 @@ +/* + * Copyright (C) 2004 g10 Code GmbH + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + */ + +/* + This is a crytpo module wrapping the classic pgp code. + */ + +#include "crypt-mod.h" +#include "pgp.h" + +static void crypt_mod_pgp_void_passphrase (void) +{ + pgp_void_passphrase (); +} + +static int crypt_mod_pgp_valid_passphrase (void) +{ + return pgp_valid_passphrase (); +} + +static int crypt_mod_pgp_decrypt_mime (FILE *a, FILE **b, BODY *c, BODY **d) +{ + return pgp_decrypt_mime (a, b, c, d); +} +static void crypt_mod_pgp_application_handler (BODY *m, STATE *s) +{ + pgp_application_pgp_handler (m, s); +} + +static char *crypt_mod_pgp_findkeys (ADDRESS *to, ADDRESS *cc, ADDRESS *bcc) +{ + return pgp_findKeys (to, cc, bcc); +} + +static BODY *crypt_mod_pgp_sign_message (BODY *a) +{ + return pgp_sign_message (a); +} + +static int crypt_mod_pgp_verify_one (BODY *sigbdy, STATE *s, const char *tempf) +{ + return pgp_verify_one (sigbdy, s, tempf); +} + +static int crypt_mod_pgp_send_menu (HEADER *msg, int *redraw) +{ + return pgp_send_menu (msg, redraw); +} + +static BODY *crypt_mod_pgp_encrypt_message (BODY *a, char *keylist, int sign) +{ + return pgp_encrypt_message (a, keylist, sign); +} + +static BODY *crypt_mod_pgp_make_key_attachment (char *tempf) +{ + return pgp_make_key_attachment (tempf); +} + +static int crypt_mod_pgp_check_traditional (FILE *fp, BODY *b, int tagged_only) +{ + return pgp_check_traditional (fp, b, tagged_only); +} + +static BODY *crypt_mod_pgp_traditional_encryptsign (BODY *a, int flags, char *keylist) +{ + return pgp_traditional_encryptsign (a, flags, keylist); +} + +static void crypt_mod_pgp_encrypted_handler (BODY *m, STATE *s) +{ + pgp_encrypted_handler (m, s); +} + +static void crypt_mod_pgp_invoke_getkeys (ADDRESS *addr) +{ + pgp_invoke_getkeys (addr); +} + +static void crypt_mod_pgp_invoke_import (const char *fname) +{ + pgp_invoke_import (fname); +} + +static void crypt_mod_pgp_extract_keys_from_attachment_list (FILE *fp, int tag, BODY *top) +{ + pgp_extract_keys_from_attachment_list (fp, tag, top); +} + +struct crypt_module_specs crypt_mod_pgp_classic = + { APPLICATION_PGP, + { + NULL, /* init */ + crypt_mod_pgp_void_passphrase, + crypt_mod_pgp_valid_passphrase, + crypt_mod_pgp_decrypt_mime, + crypt_mod_pgp_application_handler, + crypt_mod_pgp_encrypted_handler, + crypt_mod_pgp_findkeys, + crypt_mod_pgp_sign_message, + crypt_mod_pgp_verify_one, + crypt_mod_pgp_send_menu, + + crypt_mod_pgp_encrypt_message, + crypt_mod_pgp_make_key_attachment, + crypt_mod_pgp_check_traditional, + crypt_mod_pgp_traditional_encryptsign, + crypt_mod_pgp_invoke_getkeys, + crypt_mod_pgp_invoke_import, + crypt_mod_pgp_extract_keys_from_attachment_list, + + NULL, /* smime_getkeys */ + NULL, /* smime_verify_sender */ + NULL, /* smime_build_smime_entity */ + NULL, /* smime_invoke_import */ + } + }; diff --git a/crypt-mod-smime-classic.c b/crypt-mod-smime-classic.c new file mode 100644 index 0000000..e6ab753 --- /dev/null +++ b/crypt-mod-smime-classic.c @@ -0,0 +1,113 @@ +/* + * Copyright (C) 2004 g10 Code GmbH + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + */ + +/* + This is a crytpo module wrapping the classic smime code. + */ + +#include "crypt-mod.h" +#include "smime.h" + +static void crypt_mod_smime_void_passphrase (void) +{ + smime_void_passphrase (); +} + +static int crypt_mod_smime_valid_passphrase (void) +{ + return smime_valid_passphrase (); +} + +static int crypt_mod_smime_decrypt_mime (FILE *a, FILE **b, BODY *c, BODY **d) +{ + return smime_decrypt_mime (a, b, c, d); +} +static void crypt_mod_smime_application_handler (BODY *m, STATE *s) +{ + smime_application_smime_handler (m, s); +} + +static char *crypt_mod_smime_findkeys (ADDRESS *to, ADDRESS *cc, ADDRESS *bcc) +{ + return smime_findKeys (to, cc, bcc); +} + +static BODY *crypt_mod_smime_sign_message (BODY *a) +{ + return smime_sign_message (a); +} + +static int crypt_mod_smime_verify_one (BODY *sigbdy, STATE *s, const char *tempf) +{ + return smime_verify_one (sigbdy, s, tempf); +} + +static int crypt_mod_smime_send_menu (HEADER *msg, int *redraw) +{ + return smime_send_menu (msg, redraw); +} + +static void crypt_mod_smime_getkeys (ENVELOPE *env) +{ + smime_getkeys (env); +} + +static int crypt_mod_smime_verify_sender (HEADER *h) +{ + return smime_verify_sender (h); +} + +static BODY *crypt_mod_smime_build_smime_entity (BODY *a, char *certlist) +{ + return smime_build_smime_entity (a, certlist); +} + +static void crypt_mod_smime_invoke_import (char *infile, char *mailbox) +{ + smime_invoke_import (infile, mailbox); +} + + +struct crypt_module_specs crypt_mod_smime_classic = + { APPLICATION_SMIME, + { + NULL, /* init */ + crypt_mod_smime_void_passphrase, + crypt_mod_smime_valid_passphrase, + crypt_mod_smime_decrypt_mime, + crypt_mod_smime_application_handler, + NULL, /* encrypted_handler */ + crypt_mod_smime_findkeys, + crypt_mod_smime_sign_message, + crypt_mod_smime_verify_one, + crypt_mod_smime_send_menu, + + NULL, /* pgp_encrypt_message */ + NULL, /* pgp_make_key_attachment */ + NULL, /* pgp_check_traditional */ + NULL, /* pgp_traditional_encryptsign */ + NULL, /* pgp_invoke_getkeys */ + NULL, /* pgp_invoke_import */ + NULL, /* pgp_extract_keys_from_attachment_list */ + + crypt_mod_smime_getkeys, + crypt_mod_smime_verify_sender, + crypt_mod_smime_build_smime_entity, + crypt_mod_smime_invoke_import, + } + }; diff --git a/crypt-mod.c b/crypt-mod.c new file mode 100644 index 0000000..356e3e9 --- /dev/null +++ b/crypt-mod.c @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2004 g10 Code GmbH + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + */ + +#include "crypt-mod.h" + +/* A type an a variable to keep track of registered crypto modules. */ +typedef struct crypt_module *crypt_module_t; + +struct crypt_module +{ + crypt_module_specs_t specs; + crypt_module_t next, *prevp; +}; + +static crypt_module_t modules; + +/* Register a new crypto module. */ +void crypto_module_register (crypt_module_specs_t specs) +{ + crypt_module_t module_new = safe_malloc (sizeof (*module_new)); + + module_new->specs = specs; + module_new->next = modules; + if (modules) + modules->prevp = &module_new->next; + modules = module_new; +} + +/* Return the crypto module specs for IDENTIFIER. This function is + usually used via the CRYPT_MOD_CALL[_CHECK] macros. */ +crypt_module_specs_t crypto_module_lookup (int identifier) +{ + crypt_module_t module = modules; + + while (module && (module->specs->identifier != identifier)) + module = module->next; + + return module ? module->specs : NULL; +} diff --git a/crypt-mod.h b/crypt-mod.h new file mode 100644 index 0000000..4f69c3e --- /dev/null +++ b/crypt-mod.h @@ -0,0 +1,137 @@ +/* + * Copyright (C) 2004 g10 Code GmbH + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + */ + +#ifndef CRYPTOGRAPHY_H +#define CRYPTOGRAPHY_H + +#include "mutt.h" +#include "mutt_crypt.h" + +#define CRYPTO_SUPPORT(identifier) (WithCrypto & APPLICATION_ ## identifier) + + +/* + Type defintions for crypto module functions. + */ +typedef void (*crypt_func_void_passphrase_t) (void); +typedef int (*crypt_func_valid_passphrase_t) (void); + +typedef int (*crypt_func_decrypt_mime_t) (FILE *a, FILE **b, + BODY *c, BODY **d); + +typedef void (*crypt_func_application_handler_t) (BODY *m, STATE *s); +typedef void (*crypt_func_encrypted_handler_t) (BODY *m, STATE *s); + +typedef void (*crypt_func_pgp_invoke_getkeys_t) (ADDRESS *addr); +typedef int (*crypt_func_pgp_check_traditional_t) (FILE *fp, BODY *b, + int tagged_only); +typedef BODY *(*crypt_func_pgp_traditional_encryptsign_t) (BODY *a, int flags, + char *keylist); +typedef BODY *(*crypt_func_pgp_make_key_attachment_t) (char *tempf); +typedef char *(*crypt_func_findkeys_t) (ADDRESS *to, + ADDRESS *cc, ADDRESS *bcc); +typedef BODY *(*crypt_func_sign_message_t) (BODY *a); +typedef BODY *(*crypt_func_pgp_encrypt_message_t) (BODY *a, char *keylist, + int sign); +typedef void (*crypt_func_pgp_invoke_import_t) (const char *fname); +typedef int (*crypt_func_verify_one_t) (BODY *sigbdy, STATE *s, + const char *tempf); +typedef void (*crypt_func_pgp_extract_keys_from_attachment_list_t) + (FILE *fp, int tag, BODY *top); + +typedef int (*crypt_func_send_menu_t) (HEADER *msg, int *redraw); + + /* (SMIME) */ +typedef void (*crypt_func_smime_getkeys_t) (ENVELOPE *env); +typedef int (*crypt_func_smime_verify_sender_t) (HEADER *h); + +typedef BODY *(*crypt_func_smime_build_smime_entity_t) (BODY *a, + char *certlist); + +typedef void (*crypt_func_smime_invoke_import_t) (char *infile, char *mailbox); + +typedef void (*crypt_func_init_t) (void); + + +/* + A structure to keep all crypto module fucntions together. + */ +typedef struct crypt_module_functions +{ + /* Common/General functions. */ + crypt_func_init_t init; + crypt_func_void_passphrase_t void_passphrase; + crypt_func_valid_passphrase_t valid_passphrase; + crypt_func_decrypt_mime_t decrypt_mime; + crypt_func_application_handler_t application_handler; + crypt_func_encrypted_handler_t encrypted_handler; + crypt_func_findkeys_t findkeys; + crypt_func_sign_message_t sign_message; + crypt_func_verify_one_t verify_one; + crypt_func_send_menu_t send_menu; + + /* PGP specific functions. */ + crypt_func_pgp_encrypt_message_t pgp_encrypt_message; + crypt_func_pgp_make_key_attachment_t pgp_make_key_attachment; + crypt_func_pgp_check_traditional_t pgp_check_traditional; + crypt_func_pgp_traditional_encryptsign_t pgp_traditional_encryptsign; + crypt_func_pgp_invoke_getkeys_t pgp_invoke_getkeys; + crypt_func_pgp_invoke_import_t pgp_invoke_import; + crypt_func_pgp_extract_keys_from_attachment_list_t + pgp_extract_keys_from_attachment_list; + + /* S/MIME specific functions. */ + + crypt_func_smime_getkeys_t smime_getkeys; + crypt_func_smime_verify_sender_t smime_verify_sender; + crypt_func_smime_build_smime_entity_t smime_build_smime_entity; + crypt_func_smime_invoke_import_t smime_invoke_import; +} crypt_module_functions_t; + + +/* + A structure to decribe a crypto module. + */ +typedef struct crypt_module_specs +{ + int identifier; /* Identifying bit. */ + crypt_module_functions_t functions; +} *crypt_module_specs_t; + + + +/* + High Level crypto module interface. + */ + +void crypto_module_register (crypt_module_specs_t specs); +crypt_module_specs_t crypto_module_lookup (int identifier); + +/* If the crypto module identifier by IDENTIFIER has been registered, + call its function FUNC. Do nothing else. This may be used as an + expression. */ +#define CRYPT_MOD_CALL_CHECK(identifier, func) \ + (crypto_module_lookup (APPLICATION_ ## identifier) \ + && (crypto_module_lookup (APPLICATION_ ## identifier))->functions.func) + +/* Call the function FUNC in the crypto module identified by + IDENTIFIER. This may be used as an expression. */ +#define CRYPT_MOD_CALL(identifier, func) \ + *(crypto_module_lookup (APPLICATION_ ## identifier))->functions.func + +#endif diff --git a/crypt.c b/crypt.c index 5cc2cd8..dfb0974 100644 --- a/crypt.c +++ b/crypt.c @@ -4,6 +4,7 @@ * Copyright (C) 2001 Thomas Roessler * Oliver Ehli * Copyright (C) 2003 Werner Koch + * Copyright (C) 2004 g10code GmbH * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -107,64 +108,28 @@ static void disable_coredumps (void) int crypt_valid_passphrase(int flags) { time_t now = time (NULL); + int ret = 0; # if defined(HAVE_SETRLIMIT) &&(!defined(DEBUG)) disable_coredumps (); # endif if ((WithCrypto & APPLICATION_PGP) && (flags & APPLICATION_PGP)) - { - extern char PgpPass[STRING]; - extern time_t PgpExptime; - - if (pgp_use_gpg_agent()) - { - *PgpPass = 0; - return 1; /* handled by gpg-agent */ - } - - if (now < PgpExptime) return 1; /* just use the cached copy. */ - crypt_pgp_void_passphrase (); - - if (mutt_get_password (_("Enter PGP passphrase:"), - PgpPass, sizeof (PgpPass)) == 0) - { - PgpExptime = time (NULL) + PgpTimeout; - return (1); - } - else - PgpExptime = 0; - } + ret = crypt_pgp_valid_passphrase (); if ((WithCrypto & APPLICATION_SMIME) && (flags & APPLICATION_SMIME)) - { - extern char SmimePass[STRING]; - extern time_t SmimeExptime; + ret = crypt_smime_valid_passphrase (); - if (now < SmimeExptime) return (1); - crypt_smime_void_passphrase (); - - if (mutt_get_password (_("Enter SMIME passphrase:"), SmimePass, - sizeof (SmimePass)) == 0) - { - SmimeExptime = time (NULL) + SmimeTimeout; - return (1); - } - else - SmimeExptime = 0; - } - - return (0); + return ret; } -int mutt_protect (HEADER *msg, HEADER *cur, char *keylist) +int mutt_protect (HEADER *msg, char *keylist) { BODY *pbody = NULL, *tmp_pbody = NULL; BODY *tmp_smime_pbody = NULL; BODY *tmp_pgp_pbody = NULL; - int traditional = 0; int flags = (WithCrypto & APPLICATION_PGP)? msg->security: 0; int i; @@ -174,36 +139,25 @@ int mutt_protect (HEADER *msg, HEADER *cur, char *keylist) if ((msg->security & SIGN) && !crypt_valid_passphrase (msg->security)) return (-1); - if ((WithCrypto & APPLICATION_PGP) && (msg->security & APPLICATION_PGP)) + if ((WithCrypto & APPLICATION_PGP) && ((msg->security & PGPINLINE) == PGPINLINE)) { - if ((msg->content->type == TYPETEXT) && - !ascii_strcasecmp (msg->content->subtype, "plain")) + /* they really want to send it inline... go for it */ + if (!isendwin ()) mutt_endwin _("Invoking PGP..."); + pbody = crypt_pgp_traditional_encryptsign (msg->content, flags, keylist); + if (pbody) { - if (cur && cur->security && option (OPTPGPAUTOTRAD) - && (option (OPTCRYPTREPLYENCRYPT) - || option (OPTCRYPTREPLYSIGN) - || option (OPTCRYPTREPLYSIGNENCRYPTED))) - { - if(mutt_is_application_pgp(cur->content)) - traditional = 1; - } - else - { - if ((i = query_quadoption (OPT_PGPTRADITIONAL, _("Create a traditional (inline) PGP message?"))) == -1) - return -1; - else if (i == M_YES) - traditional = 1; - } - } - if (traditional) - { - if (!isendwin ()) mutt_endwin _("Invoking PGP..."); - if (!(pbody = crypt_pgp_traditional_encryptsign (msg->content, flags, keylist))) - return -1; - msg->content = pbody; return 0; } + + /* otherwise inline won't work...ask for revert */ + if ((i = query_quadoption (OPT_PGPMIMEAUTO, _("Message can't be sent inline. Revert to using PGP/MIME?"))) != M_YES) + { + mutt_error _("Mail not sent."); + return -1; + } + + /* go ahead with PGP/MIME */ } if (!isendwin ()) mutt_endwin (NULL); @@ -287,6 +241,7 @@ int mutt_protect (HEADER *msg, HEADER *cur, char *keylist) /* destroy temporary signature envelope when doing retainable * signatures. + */ if (flags != msg->security) { @@ -391,6 +346,9 @@ int mutt_is_application_pgp (BODY *m) else if (p && !ascii_strncasecmp ("pgp-keys", p, 7)) t |= PGPKEY; } + if (t) + t |= PGPINLINE; + return t; } diff --git a/cryptglue.c b/cryptglue.c index ce81860..f8ff479 100644 --- a/cryptglue.c +++ b/cryptglue.c @@ -1,5 +1,6 @@ /* * Copyright (C) 2003 Werner Koch + * Copyright (C) 2004 g10 Code GmbH * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,117 +18,92 @@ */ /* - This file dispatches the generic crytpo functions to the implemented - backend or provides dummy stubs. Note, that some generic functions are - handled in crypt.c. + This file dispatches the generic crypto functions to the + implemented backend or provides dummy stubs. Note, that some + generic functions are handled in crypt.c. */ +/* Note: This file has been changed to make use of the new module + system. Consequently there's a 1:1 mapping between the functions + contained in this file and the functions implemented by the crypto + modules. */ + #include "mutt.h" #include "mutt_crypt.h" -/* Make sure those macros are not defined. */ -#undef BFNC_PGP_VOID_PASSPHRASE -#undef BFNC_PGP_DECRYPT_MIME -#undef BFNC_PGP_APPLICATION_PGP_HANDLER -#undef BFNC_PGP_ENCRYPTED_HANDLER -#undef BFNC_PGP_INVOKE_GETKEYS -#undef BFNC_PGP_ASK_FOR_KEY -#undef BNFC_PGP_CHECK_TRADITIONAL -#undef BFNC_PGP_TRADITIONAL_ENCRYPTSIGN -#undef BFNC_PGP_FREE_KEY -#undef BFNC_PGP_MAKE_KEY_ATTACHMENT -#undef BFNC_PGP_FINDKEYS -#undef BFNC_PGP_SIGN_MESSAGE -#undef BFNC_PGP_ENCRYPT_MESSAGE -#undef BFNC_PGP_INVOKE_IMPORT -#undef BFNC_PGP_VERIFY_ONE -#undef BFNC_PGP_KEYID -#undef BFNC_PGP_EXTRACT_KEYS_FROM_ATTACHMENT_LIST - -#undef BFNC_SMIME_VOID_PASSPHRASE -#undef BFNC_SMIME_DECRYPT_MIME -#undef BFNC_SMIME_APPLICATION_SMIME_HANDLER -#undef BFNC_SMIME_GETKEYS -#undef BFNC_SMIME_VERIFY_SENDER -#undef BFNC_SMIME_ASK_FOR_KEY -#undef BFNC_SMIME_FINDKEYS -#undef BFNC_SMIME_SIGN_MESSAGE -#undef BFNC_SMIME_BUILD_SMIME_ENTITY -#undef BFNC_SMIME_INVOKE_IMPORT -#undef BFNC_SMIME_VERIFY_ONE - - -/* The PGP backend */ -#if defined (CRYPT_BACKEND_CLASSIC_PGP) -# include "pgp.h" -# define BFNC_PGP_VOID_PASSPHRASE pgp_void_passphrase -# define BFNC_PGP_DECRYPT_MIME pgp_decrypt_mime -# define BFNC_PGP_APPLICATION_PGP_HANDLER pgp_application_pgp_handler -# define BFNC_PGP_ENCRYPTED_HANDLER pgp_encrypted_handler -# define BFNC_PGP_INVOKE_GETKEYS pgp_invoke_getkeys -# define BFNC_PGP_ASK_FOR_KEY pgp_ask_for_key -# define BNFC_PGP_CHECK_TRADITIONAL pgp_check_traditional -# define BFNC_PGP_TRADITIONAL_ENCRYPTSIGN pgp_traditional_encryptsign -# define BFNC_PGP_FREE_KEY pgp_free_key -# define BFNC_PGP_MAKE_KEY_ATTACHMENT pgp_make_key_attachment -# define BFNC_PGP_FINDKEYS pgp_findKeys -# define BFNC_PGP_SIGN_MESSAGE pgp_sign_message -# define BFNC_PGP_ENCRYPT_MESSAGE pgp_encrypt_message -# define BFNC_PGP_INVOKE_IMPORT pgp_invoke_import -# define BFNC_PGP_VERIFY_ONE pgp_verify_one -# define BFNC_PGP_KEYID pgp_keyid -# define BFNC_PGP_EXTRACT_KEYS_FROM_ATTACHMENT_LIST \ - pgp_extract_keys_from_attachment_list - - -#elif defined (CRYPT_BACKEND_GPGME) -# include "crypt-gpgme.h" -# define BFNC_PGP_VOID_PASSPHRASE NULL /* not required */ -# define BFNC_PGP_DECRYPT_MIME gpg_pgp_decrypt_mime - -#endif /* PGP backend */ - - -/* The SMIME backend */ -#ifdef CRYPT_BACKEND_CLASSIC_SMIME -# include "smime.h" -# define BFNC_SMIME_VOID_PASSPHRASE smime_void_passphrase -# define BFNC_SMIME_DECRYPT_MIME smime_decrypt_mime -# define BFNC_SMIME_APPLICATION_SMIME_HANDLER smime_application_smime_handler -# define BFNC_SMIME_GETKEYS smime_getkeys -# define BFNC_SMIME_VERIFY_SENDER smime_verify_sender -# define BFNC_SMIME_ASK_FOR_KEY smime_ask_for_key -# define BFNC_SMIME_FINDKEYS smime_findKeys -# define BFNC_SMIME_SIGN_MESSAGE smime_sign_message -# define BFNC_SMIME_BUILD_SMIME_ENTITY smime_build_smime_entity -# define BFNC_SMIME_INVOKE_IMPORT smime_invoke_import -# define BFNC_SMIME_VERIFY_ONE smime_verify_one - -#elif defined (CRYPT_BACKEND_GPGME) - /* Already included above (gpgme supports both). */ -# define BFNC_SMIME_VOID_PASSPHRASE NULL /* not required */ - -#endif /* SMIME backend */ +#include "crypt-mod.h" - /* Generic */ +#ifdef CRYPT_BACKEND_CLASSIC_PGP +extern struct crypt_module_specs crypt_mod_pgp_classic; +#endif + +#ifdef CRYPT_BACKEND_CLASSIC_SMIME +extern struct crypt_module_specs crypt_mod_smime_classic; +#endif + +#ifdef CRYPT_BACKEND_GPGME +extern struct crypt_module_specs crypt_mod_pgp_gpgme; +extern struct crypt_module_specs crypt_mod_smime_gpgme; +#endif + +void crypt_init (void) +{ +#ifdef CRYPT_BACKEND_CLASSIC_PGP + if ( +#ifdef CRYPT_BACKEND_GPGME + (! option (OPTCRYPTUSEGPGME)) +#else + 1 +#endif + ) + crypto_module_register (&crypt_mod_pgp_classic); +#endif + +#ifdef CRYPT_BACKEND_CLASSIC_SMIME + if ( +#ifdef CRYPT_BACKEND_GPGME + (! option (OPTCRYPTUSEGPGME)) +#else + 1 +#endif + ) + crypto_module_register (&crypt_mod_smime_classic); +#endif + + if (option (OPTCRYPTUSEGPGME)) + { +#ifdef CRYPT_BACKEND_GPGME + crypto_module_register (&crypt_mod_pgp_gpgme); + crypto_module_register (&crypt_mod_smime_gpgme); +#else + mutt_message (_("\"crypt_use_gpgme\" set" + " but not build with GPGME support.")); +#endif + } + +#if defined CRYPT_BACKEND_CLASSIG_PGP || defined CRYPT_BACKEND_CLASSIG_SMIME || defined CRYPT_BACKEND_GPGME + if (CRYPT_MOD_CALL_CHECK (PGP, init)) + (CRYPT_MOD_CALL (PGP, init)) (); + + if (CRYPT_MOD_CALL_CHECK (SMIME, init)) + (CRYPT_MOD_CALL (SMIME, init)) (); +#endif +} + + /* Show a message that a backend will be invoked. */ void crypt_invoke_message (int type) { -#if defined (CRYPT_BACKEND_CLASSIC_PGP) || defined(CRYPT_BACKEND_CLASSIC_SMIME) - if ((type & APPLICATION_PGP)) + if ((WithCrypto & APPLICATION_PGP) && (type & APPLICATION_PGP)) mutt_message _("Invoking PGP..."); - if ((type & APPLICATION_SMIME)) - mutt_message _("Invoking OpenSSL..."); -#elif defined (CRYPT_BACKEND_GPGME) - if ((type & APPLICATION_PGP) || (type & APPLICATION_SMIME) ) - mutt_message _("Invoking GnuPG..."); -#endif + else if ((WithCrypto & APPLICATION_SMIME) && (type & APPLICATION_SMIME)) + mutt_message _("Invoking SMIME..."); } @@ -142,163 +118,136 @@ void crypt_invoke_message (int type) /* Reset a PGP passphrase */ void crypt_pgp_void_passphrase (void) { -#ifdef BFNC_PGP_VOID_PASSPHRASE - BFNC_PGP_VOID_PASSPHRASE (); -#endif + if (CRYPT_MOD_CALL_CHECK (PGP, void_passphrase)) + (CRYPT_MOD_CALL (PGP, void_passphrase)) (); } +int crypt_pgp_valid_passphrase (void) +{ + if (CRYPT_MOD_CALL_CHECK (PGP, valid_passphrase)) + return (CRYPT_MOD_CALL (PGP, valid_passphrase)) (); + + return 0; +} + + /* Decrypt a PGP/MIME message. */ int crypt_pgp_decrypt_mime (FILE *a, FILE **b, BODY *c, BODY **d) { -#ifdef BFNC_PGP_DECRYPT_MIME - return BFNC_PGP_DECRYPT_MIME (a, b, c, d); -#else - return -1; /* error */ -#endif + if (CRYPT_MOD_CALL_CHECK (PGP, decrypt_mime)) + return (CRYPT_MOD_CALL (PGP, decrypt_mime)) (a, b, c, d); + + return -1; } /* MIME handler for the application/pgp content-type. */ void crypt_pgp_application_pgp_handler (BODY *m, STATE *s) { -#ifdef BFNC_PGP_APPLICATION_PGP_HANDLER - BFNC_PGP_APPLICATION_PGP_HANDLER (m, s); -#endif + if (CRYPT_MOD_CALL_CHECK (PGP, application_handler)) + (CRYPT_MOD_CALL (PGP, application_handler)) (m, s); } /* MIME handler for an PGP/MIME encrypted message. */ void crypt_pgp_encrypted_handler (BODY *a, STATE *s) { -#ifdef BFNC_PGP_ENCRYPTED_HANDLER - BFNC_PGP_ENCRYPTED_HANDLER (a, s); -#endif + if (CRYPT_MOD_CALL_CHECK (PGP, encrypted_handler)) + (CRYPT_MOD_CALL (PGP, encrypted_handler)) (a, s); } /* fixme: needs documentation. */ void crypt_pgp_invoke_getkeys (ADDRESS *addr) { -#ifdef BFNC_PGP_INVOKE_GETKEYS - BFNC_PGP_INVOKE_GETKEYS (addr); -#endif -} - -/* Ask for a PGP key. */ -pgp_key_t crypt_pgp_ask_for_key (char *tag, char *whatfor, - short abilities, pgp_ring_t keyring) -{ -#ifdef BFNC_PGP_ASK_FOR_KEY - return BFNC_PGP_ASK_FOR_KEY (tag, whatfor, abilities, keyring); -#else - return NULL; -#endif + if (CRYPT_MOD_CALL_CHECK (PGP, pgp_invoke_getkeys)) + (CRYPT_MOD_CALL (PGP, pgp_invoke_getkeys)) (addr); } - /* Check for a traditional PGP message in body B. */ int crypt_pgp_check_traditional (FILE *fp, BODY *b, int tagged_only) { -#ifdef BNFC_PGP_CHECK_TRADITIONAL - return BNFC_PGP_CHECK_TRADITIONAL (fp, b, tagged_only); -#else - return 0; /* no */ -#endif + if (CRYPT_MOD_CALL_CHECK (PGP, pgp_check_traditional)) + return (CRYPT_MOD_CALL (PGP, pgp_check_traditional)) (fp, b, tagged_only); + + return 0; } /* fixme: needs documentation. */ BODY *crypt_pgp_traditional_encryptsign (BODY *a, int flags, char *keylist) { -#ifdef BFNC_PGP_TRADITIONAL_ENCRYPTSIGN - return BFNC_PGP_TRADITIONAL_ENCRYPTSIGN (a, flags, keylist); -#else - return NULL; -#endif -} + if (CRYPT_MOD_CALL_CHECK (PGP, pgp_traditional_encryptsign)) + return (CRYPT_MOD_CALL (PGP, pgp_traditional_encryptsign)) (a, flags, keylist); -/* Release pgp key KPP. */ -void crypt_pgp_free_key (pgp_key_t *kpp) -{ -#ifdef BFNC_PGP_FREE_KEY - BFNC_PGP_FREE_KEY (kpp); -#endif + return NULL; } - /* Generate a PGP public key attachment. */ BODY *crypt_pgp_make_key_attachment (char *tempf) { -#ifdef BFNC_PGP_MAKE_KEY_ATTACHMENT - return BFNC_PGP_MAKE_KEY_ATTACHMENT (tempf); -#else - return NULL; /* error */ -#endif + if (CRYPT_MOD_CALL_CHECK (PGP, pgp_make_key_attachment)) + return (CRYPT_MOD_CALL (PGP, pgp_make_key_attachment)) (tempf); + + return NULL; } /* This routine attempts to find the keyids of the recipients of a message. It returns NULL if any of the keys can not be found. */ char *crypt_pgp_findkeys (ADDRESS *to, ADDRESS *cc, ADDRESS *bcc) { -#ifdef BFNC_PGP_FINDKEYS - return BFNC_PGP_FINDKEYS (to, cc, bcc); -#else + if (CRYPT_MOD_CALL_CHECK (PGP, findkeys)) + return (CRYPT_MOD_CALL (PGP, findkeys)) (to, cc, bcc); + return NULL; -#endif } /* Create a new body with a PGP signed message from A. */ BODY *crypt_pgp_sign_message (BODY *a) { -#ifdef BFNC_PGP_SIGN_MESSAGE - return BFNC_PGP_SIGN_MESSAGE (a); -#else + if (CRYPT_MOD_CALL_CHECK (PGP, sign_message)) + return (CRYPT_MOD_CALL (PGP, sign_message)) (a); + return NULL; -#endif } /* Warning: A is no longer freed in this routine, you need to free it later. This is necessary for $fcc_attach. */ BODY *crypt_pgp_encrypt_message (BODY *a, char *keylist, int sign) { -#ifdef BFNC_PGP_ENCRYPT_MESSAGE - return BFNC_PGP_ENCRYPT_MESSAGE (a, keylist, sign); -#else + if (CRYPT_MOD_CALL_CHECK (PGP, pgp_encrypt_message)) + return (CRYPT_MOD_CALL (PGP, pgp_encrypt_message)) (a, keylist, sign); + return NULL; -#endif } /* Invoke the PGP command to import a key. */ void crypt_pgp_invoke_import (const char *fname) { -#ifdef BFNC_PGP_INVOKE_IMPORT - BFNC_PGP_INVOKE_IMPORT (fname); -#endif + if (CRYPT_MOD_CALL_CHECK (PGP, pgp_invoke_import)) + (CRYPT_MOD_CALL (PGP, pgp_invoke_import)) (fname); } /* fixme: needs documentation */ int crypt_pgp_verify_one (BODY *sigbdy, STATE *s, const char *tempf) { -#ifdef BFNC_PGP_VERIFY_ONE - return BFNC_PGP_VERIFY_ONE (sigbdy, s, tempf); -#else + if (CRYPT_MOD_CALL_CHECK (PGP, verify_one)) + return (CRYPT_MOD_CALL (PGP, verify_one)) (sigbdy, s, tempf); + return -1; -#endif } -/* Access the keyID in K. */ -char *crypt_pgp_keyid (pgp_key_t k) +int crypt_pgp_send_menu (HEADER *msg, int *redraw) { -#ifdef BFNC_PGP_KEYID - return pgp_keyid (k); -#else - return "?"; -#endif + if (CRYPT_MOD_CALL_CHECK (PGP, send_menu)) + return (CRYPT_MOD_CALL (PGP, send_menu)) (msg, redraw); + + return 0; } + /* fixme: needs documentation */ void crypt_pgp_extract_keys_from_attachment_list (FILE *fp, int tag, BODY *top) { -#ifdef BFNC_PGP_EXTRACT_KEYS_FROM_ATTACHMENT_LIST - BFNC_PGP_EXTRACT_KEYS_FROM_ATTACHMENT_LIST (fp, tag, top); -#endif + if (CRYPT_MOD_CALL_CHECK (PGP, pgp_extract_keys_from_attachment_list)) + (CRYPT_MOD_CALL (PGP, pgp_extract_keys_from_attachment_list)) (fp, tag, top); } @@ -313,104 +262,105 @@ void crypt_pgp_extract_keys_from_attachment_list (FILE *fp, int tag, BODY *top) /* Reset an SMIME passphrase */ void crypt_smime_void_passphrase (void) { -#ifdef BFNC_SMIME_VOID_PASSPHRASE - BFNC_SMIME_VOID_PASSPHRASE (); -#endif + if (CRYPT_MOD_CALL_CHECK (SMIME, void_passphrase)) + (CRYPT_MOD_CALL (SMIME, void_passphrase)) (); } +int crypt_smime_valid_passphrase (void) +{ + if (CRYPT_MOD_CALL_CHECK (SMIME, valid_passphrase)) + return (CRYPT_MOD_CALL (SMIME, valid_passphrase)) (); + + return 0; +} /* Decrypt am S/MIME message. */ int crypt_smime_decrypt_mime (FILE *a, FILE **b, BODY *c, BODY **d) { -#ifdef BFNC_SMIME_DECRYPT_MIME - return BFNC_SMIME_DECRYPT_MIME (a, b, c, d); -#else - return -1; /* error */ -#endif + if (CRYPT_MOD_CALL_CHECK (SMIME, decrypt_mime)) + return (CRYPT_MOD_CALL (SMIME, decrypt_mime)) (a, b, c, d); + + return -1; } /* MIME handler for the application/smime content-type. */ void crypt_smime_application_smime_handler (BODY *m, STATE *s) { -#ifdef BFNC_SMIME_APPLICATION_SMIME_HANDLER - BFNC_SMIME_APPLICATION_SMIME_HANDLER (m, s); -#endif + if (CRYPT_MOD_CALL_CHECK (SMIME, application_handler)) + (CRYPT_MOD_CALL (SMIME, application_handler)) (m, s); +} + +/* MIME handler for an PGP/MIME encrypted message. */ +void crypt_smime_encrypted_handler (BODY *a, STATE *s) +{ + if (CRYPT_MOD_CALL_CHECK (SMIME, encrypted_handler)) + (CRYPT_MOD_CALL (SMIME, encrypted_handler)) (a, s); } /* fixme: Needs documentation. */ void crypt_smime_getkeys (ENVELOPE *env) { -#ifdef BFNC_SMIME_GETKEYS - BFNC_SMIME_GETKEYS (env); -#endif + if (CRYPT_MOD_CALL_CHECK (SMIME, smime_getkeys)) + (CRYPT_MOD_CALL (SMIME, smime_getkeys)) (env); } /* Check that the sender matches. */ int crypt_smime_verify_sender(HEADER *h) { -#ifdef BFNC_SMIME_VERIFY_SENDER - return BFNC_SMIME_VERIFY_SENDER (h); -#else - return 1; /* yes */ -#endif -} + if (CRYPT_MOD_CALL_CHECK (SMIME, smime_verify_sender)) + return (CRYPT_MOD_CALL (SMIME, smime_verify_sender)) (h); -/* Ask for an SMIME key. */ -char *crypt_smime_ask_for_key (char *prompt, char *mailbox, short public) -{ -#ifdef BFNC_SMIME_ASK_FOR_KEY - return BFNC_SMIME_ASK_FOR_KEY (prompt, mailbox, public); -#else - return NULL; /* error */ -#endif + return 1; } - /* This routine attempts to find the keyids of the recipients of a message. It returns NULL if any of the keys can not be found. */ char *crypt_smime_findkeys (ADDRESS *to, ADDRESS *cc, ADDRESS *bcc) { -#ifdef BFNC_SMIME_FINDKEYS - return BFNC_SMIME_FINDKEYS (to, cc, bcc); -#else + if (CRYPT_MOD_CALL_CHECK (SMIME, findkeys)) + return (CRYPT_MOD_CALL (SMIME, findkeys)) (to, cc, bcc); + return NULL; -#endif } /* fixme: Needs documentation. */ BODY *crypt_smime_sign_message (BODY *a) { -#ifdef BFNC_SMIME_SIGN_MESSAGE - return BFNC_SMIME_SIGN_MESSAGE (a); -#else + if (CRYPT_MOD_CALL_CHECK (SMIME, sign_message)) + return (CRYPT_MOD_CALL (SMIME, sign_message)) (a); + return NULL; -#endif } /* fixme: needs documentation. */ BODY *crypt_smime_build_smime_entity (BODY *a, char *certlist) { -#ifdef BFNC_SMIME_BUILD_SMIME_ENTITY - return BFNC_SMIME_BUILD_SMIME_ENTITY (a, certlist); -#else + if (CRYPT_MOD_CALL_CHECK (SMIME, smime_build_smime_entity)) + return (CRYPT_MOD_CALL (SMIME, smime_build_smime_entity)) (a, certlist); + return NULL; -#endif } /* Add a certificate and update index file (externally). */ void crypt_smime_invoke_import (char *infile, char *mailbox) { -#ifdef BFNC_SMIME_INVOKE_IMPORT - BFNC_SMIME_INVOKE_IMPORT (infile, mailbox); -#endif + if (CRYPT_MOD_CALL_CHECK (SMIME, smime_invoke_import)) + (CRYPT_MOD_CALL (SMIME, smime_invoke_import)) (infile, mailbox); } /* fixme: needs documentation */ int crypt_smime_verify_one (BODY *sigbdy, STATE *s, const char *tempf) { -#ifdef BFNC_SMIME_VERIFY_ONE - return BFNC_SMIME_VERIFY_ONE (sigbdy, s, tempf); -#else + if (CRYPT_MOD_CALL_CHECK (SMIME, verify_one)) + return (CRYPT_MOD_CALL (SMIME, verify_one)) (sigbdy, s, tempf); + return -1; -#endif +} + +int crypt_smime_send_menu (HEADER *msg, int *redraw) +{ + if (CRYPT_MOD_CALL_CHECK (SMIME, send_menu)) + return (CRYPT_MOD_CALL (SMIME, send_menu)) (msg, redraw); + + return 0; } diff --git a/crypthash.h b/crypthash.h new file mode 100644 index 0000000..a2545b8 --- /dev/null +++ b/crypthash.h @@ -0,0 +1,27 @@ +#ifndef _CRYPTHASH_H +# define _CRYPTHASH_H + +# include "config.h" + + +# include +# if HAVE_INTTYPES_H +# include +# else +# if HAVE_STDINT_H +# include +# endif +# endif + +/* POINTER defines a generic pointer type */ +typedef unsigned char *POINTER; + +# ifndef HAVE_UINT32_T +# if SIZEOF_INT == 4 +typedef unsigned int uint32_t; +# elif SIZEOF_LONG == 4 +typedef unsigned long uint32_t; +# endif +# endif + +#endif diff --git a/curs_lib.c b/curs_lib.c index a764b6a..9c0567a 100644 --- a/curs_lib.c +++ b/curs_lib.c @@ -1,5 +1,6 @@ /* * Copyright (C) 1996-2002 Michael R. Elkins + * Copyright (C) 2004 g10 Code GmbH * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -57,6 +58,20 @@ void mutt_refresh (void) refresh (); } +/* Make sure that the next refresh does a full refresh. This could be + optmized by not doing it at all if DISPLAY is set as this might + indicate that a GUI based pinentry was used. Having an option to + customize this is of course the Mutt way. */ +void mutt_need_hard_redraw (void) +{ + if (!getenv ("DISPLAY")) + { + keypad (stdscr, TRUE); + clearok (stdscr, TRUE); + set_option (OPTNEEDREDRAW); + } +} + event_t mutt_getch (void) { int ch; @@ -162,6 +177,19 @@ void mutt_clear_error (void) CLEARLINE (LINES-1); } +static void fix_end_of_file (const char *data) +{ + FILE *fp; + int c; + + if ((fp = safe_fopen (data, "a+")) == NULL) + return; + fseek (fp,-1,SEEK_END); + if ((c = fgetc(fp)) != '\n') + fputc ('\n', fp); + safe_fclose (&fp); +} + void mutt_edit_file (const char *editor, const char *data) { char cmd[LONG_STRING]; @@ -170,6 +198,7 @@ void mutt_edit_file (const char *editor, const char *data) mutt_expand_file_fmt (cmd, sizeof (cmd), editor, data); if (mutt_system (cmd) == -1) mutt_error (_("Error running \"%s\"!"), cmd); + fix_end_of_file (data); keypad (stdscr, TRUE); clearok (stdscr, TRUE); } diff --git a/curs_main.c b/curs_main.c index c58b71a..4982c73 100644 --- a/curs_main.c +++ b/curs_main.c @@ -1178,6 +1178,9 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE); case OP_MAIN_SYNC_FOLDER: + if (Context && !Context->msgcount) + break; + CHECK_MSGCOUNT; CHECK_VISIBLE; CHECK_READONLY; @@ -2148,7 +2151,9 @@ CHECK_IMAP_ACL(IMAP_ACL_INSERT); break; CHECK_MSGCOUNT; CHECK_VISIBLE; - mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw); + if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)) + mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw); + if (menu->menu == MENU_PAGER) { op = OP_DISPLAY_MESSAGE; diff --git a/cvslog2changelog.pl b/cvslog2changelog.pl index 6f083ef..1f8b3be 100644 --- a/cvslog2changelog.pl +++ b/cvslog2changelog.pl @@ -38,11 +38,11 @@ while (<>) { } } elsif ($_ =~ /^revision ([0-9.]*)/) { $change->{revision} = $1; - } elsif ($_ =~ /^date: ([^; ]*) ([^; ]*); author: ([^;]*);/) { + } elsif ($_ =~ /^date: ([^; ]*) ([^; ]*)( \+[0-9]+)?; author: ([^;]*);/) { $change->{date} = $1; $change->{hour} = $2; - $change->{author} = $Authors{$3} ? $Authors{$3} : $3; - $change->{committed} = $3; + $change->{author} = $Authors{$3} ? $Authors{$3} : $4; + $change->{committed} = $4; } elsif ($_ =~ /^From: (.*)$/) { $change->{author} = $1; } elsif ($change->{revision}) { diff --git a/doc/Makefile.in b/doc/Makefile.in index 9f85854..d3b54e7 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 3.2 2002/12/07 14:15:01 roessler Exp $ +# $Id: Makefile.in,v 3.4 2004/04/30 06:49:37 roessler Exp $ SHELL = /bin/sh @@ -44,6 +44,7 @@ DISTFILES = Makefile.in dotlock.man \ muttrc.man.tail \ muttrc.man \ mbox.man \ + mmdf.man \ manual.sgml.head \ manual.sgml.tail \ manual.sgml \ diff --git a/doc/manual.sgml.head b/doc/manual.sgml.head index 90a7329..4cf19a1 100644 --- a/doc/manual.sgml.head +++ b/doc/manual.sgml.head @@ -568,7 +568,7 @@ Also see .

If you want to use PGP, you can specify - + ``E'' encrypts, ``S'' signs and ``S<id>'' signs with the given key, setting which the macro will be bound. +Multiple maps may be specified by separating multiple menu arguments by +commas. Whitespace may not be used in between the menu arguments and the +commas separating them. + . There are some additions however. The first is that control characters in and a with its arguments. -Change settings based upon message recipients

Usage: -Usage: +Usage: variable depending on the message's sender +address. + +For each type of Spam detection

+Usage: +Usage: variable. (Tip: try +spam "X-DCC-.*-Metrics:.*(....)=many" "90+/DCC-%1" +spam "X-Spam-Status: Yes" "90+/SA" +spam "X-PerlMX-Spam: .*Probability=([0-9]+)%" "%1/PM" +set spam_separator=", " + + +If I then received a message that DCC registered with ``many'' hits +under the ``Fuz2'' checksum, and that PureMessage registered with a +97% probability of being spam, that message's spam tag would read +90+/DCC-Fuz2, 97/PM. (The four characters before ``=many'' in a +DCC report indicate the checksum used -- in this case, ``Fuz2''.) + +If the $spam_separator variable is unset, then each +spam pattern match supercedes the previous one. Instead of getting +joined +spam "^From: .*MAILER-DAEMON" "999" + + + Setting variables

Usage: @@ -1574,7 +1689,7 @@ path of your home directory. If the filename ends with a vertical bar (|), then source ~/bin/myscript|). Removing hooks

@@ -1770,6 +1885,7 @@ messages: ~f USER messages originating from USER ~g cryptographically signed messages ~G cryptographically encrypted messages +~H EXPR messages with a spam attribute matching EXPR ~h EXPR messages which contain EXPR in the message header ~k message contains PGP key material ~i ID message which match ID in the ``Message-ID'' field @@ -1795,6 +1911,7 @@ messages: ~y EXPR messages which contain EXPR in the `X-Label' field ~z [MIN]-[MAX] messages with a size in the range MIN to MAX *) ~= duplicated messages (see $duplicate_threads) +~$ unreferenced messages (requires threaded view) Where EXPR, USER, ID, and SUBJECT are @@ -1871,8 +1988,9 @@ pattern language. For example, ~f "me@(mutt\.org|cs\.hmc\.edu)" -Without the quotes, the parenthesis would truncate the regular expression -to simply Searching by Date

@@ -1962,6 +2080,13 @@ manner. If the variable is set, the next operation applies to the tagged messages automatically, without requiring the ``tag-prefix''. +In or commands, +you can use the ``tag-prefix-cond'' operator. If there are no tagged +messages, mutt will "eat" the rest of the macro to abort it's execution. +Mutt will stop "eating" the macro when it encounters the ``end-cond'' +operator; after this operator the rest of the macro will be executed as +normal. + Using Hooks

A + variable, which defaults to every 60 seconds. If Mutt was compiled with SSL support (by running the variable. Polling for new mail on an IMAP server can cause noticeable delays. So, you'll want to carefully tune the - + and variables. Personally I use @@ -2401,15 +2526,15 @@ in the following order: SASL, ANONYMOUS, GSSAPI, CRAM-MD5, LOGIN. There are a few variables which control authentication: - - controls + - controls the username under which you request authentication on the IMAP server, for all authenticators. This is overridden by an explicit username in the mailbox path (ie by using a mailbox name of the form - a + - a password which you may preset, used by all authentication methods where a password is needed. - - a colon-delimited list of IMAP authentication methods to try, in the order you wish to try them. If specified, this overrides mutt's default (attempt everything, in the order @@ -2436,7 +2561,7 @@ account-hook imap://host2/ 'set tunnel="ssh host2 /usr/libexec/imapd"' Start a WWW Browser on URLs (EXTERNAL)

-If a message contains URLs (http://www.mutt.org/), it is efficient to get a menu with all the URLs and start a WWW browser on one of them. This functionality is provided by the external urlview program which can be @@ -3112,7 +3237,7 @@ associated with this extension will then be used to process the attachment according to the rules in the mailcap file and according to any other configuration options (such as auto_view) specified. Common usage would be: -mime-lookup application/octet-stream application/X-Lotus-Manuscript +mime_lookup application/octet-stream application/X-Lotus-Manuscript In addition, the unmime_lookup command may be used to disable this feature @@ -3222,9 +3347,9 @@ The following are the commands understood by mutt. - - @@ -3262,15 +3387,21 @@ The following are the commands understood by mutt. + [no|inv] - + + - diff --git a/doc/manual.sgml.tail b/doc/manual.sgml.tail index 0e86a6f..3490b3f 100644 --- a/doc/manual.sgml.tail +++ b/doc/manual.sgml.tail @@ -43,6 +43,7 @@ select-entry RET select the current entry shell-escape ! run a program in a subshell tag-entry t toggle the tag on the current entry tag-prefix ; apply next command to tagged entries +tag-prefix-cond not bound apply next function ONLY to tagged messages top-page H move to the top of the page index diff --git a/doc/manual.txt b/doc/manual.txt index 6b1b1e9..dd79de5 100644 --- a/doc/manual.txt +++ b/doc/manual.txt @@ -1,6 +1,6 @@ The Mutt E-Mail Client by Michael Elkins - version 1.5.6 + version 1.5.7 ``All mail clients suck. This one just sucks less.'' -me, circa 1995 ______________________________________________________________________ @@ -59,9 +59,10 @@ 3.21 Adding key sequences to the keyboard buffer 3.22 Executing functions 3.23 Message Scoring - 3.24 Setting variables - 3.25 Reading initialization commands from another file - 3.26 Removing hooks + 3.24 Spam detection + 3.25 Setting variables + 3.26 Reading initialization commands from another file + 3.27 Removing hooks 4. Advanced Usage @@ -417,22 +418,22 @@ ______________________________________________________________________ - 11.. IInnttrroodduuccttiioonn + 1. Introduction - MMuutttt is a small but very powerful text-based MIME mail client. Mutt + Mutt is a small but very powerful text-based MIME mail client. Mutt is highly configurable, and is well suited to the mail power user with advanced features like key bindings, keyboard macros, mail threading, regular expression searches and a powerful pattern matching language for selecting groups of messages. - 11..11.. MMuutttt HHoommee PPaaggee + 1.1. Mutt Home Page http://www.mutt.org/ - 11..22.. MMaaiilliinngg LLiissttss + 1.2. Mailing Lists To subscribe to one of the following mailing lists, send a message - with the word _s_u_b_s_c_r_i_b_e in the body to list-name_-_r_e_q_u_e_s_t@mutt.org. + with the word subscribe in the body to list-name-request@mutt.org. · mutt-announce@mutt.org -- low traffic list for announcements @@ -440,26 +441,26 @@ · mutt-dev@mutt.org -- development mailing list - NNoottee:: all messages posted to _m_u_t_t_-_a_n_n_o_u_n_c_e are automatically forwarded - to _m_u_t_t_-_u_s_e_r_s, so you do not need to be subscribed to both lists. + Note: all messages posted to mutt-announce are automatically forwarded + to mutt-users, so you do not need to be subscribed to both lists. - 11..33.. SSooffttwwaarree DDiissttrriibbuuttiioonn SSiitteess + 1.3. Software Distribution Sites · ftp://ftp.mutt.org/mutt/ For a list of mirror sites, please refer to http://www.mutt.org/download.html. - 11..44.. IIRRCC + 1.4. IRC - Visit channel _#_m_u_t_t on OpenProjects.Net (www.openprojects.net) to chat + Visit channel #mutt on OpenProjects.Net (www.openprojects.net) to chat with other people interested in Mutt. - 11..55.. UUSSEENNEETT + 1.5. USENET See the newsgroup comp.mail.mutt. - 11..66.. CCooppyyrriigghhtt + 1.6. Copyright Mutt is Copyright (C) 1996-2000 Michael R. Elkins and others @@ -478,7 +479,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - 22.. GGeettttiinngg SSttaarrtteedd + 2. Getting Started This section is intended as a brief overview of how to use Mutt. There are many other features which are described elsewhere in the @@ -494,7 +495,7 @@ at the command line. There are various command-line options, see either the mutt man page or the ``reference''. - 22..11.. MMoovviinngg AArroouunndd iinn MMeennuuss + 2.1. Moving Around in Menus Information is presented in menus, very similar to ELM. Here is a table showing the common keys used to navigate menus in Mutt. @@ -651,8 +652,8 @@ \ toggle search pattern coloring ^ jump to the top of the message - In addition, many of the functions from the _i_n_d_e_x are available in the - pager, such as _d_e_l_e_t_e_-_m_e_s_s_a_g_e or _c_o_p_y_-_m_e_s_s_a_g_e (this is one advantage + In addition, many of the functions from the index are available in the + pager, such as delete-message or copy-message (this is one advantage over using an external pager to view messages). Also, the internal pager supports a couple other advanced features. @@ -723,17 +724,17 @@ See also: ``$strict_threads''. - 22..33..44.. MMiisscceellllaanneeoouuss FFuunnccttiioonnss + 2.3.4. Miscellaneous Functions - ccrreeaattee--aalliiaass (default: a) + create-alias (default: a) Creates a new alias based upon the current message (or prompts for a new one). Once editing is complete, an ``alias'' command is added to the file specified by the ``$alias_file'' variable for future use. - NNoottee:: Specifying an ``$alias_file'' does not add the aliases specified + Note: Specifying an ``$alias_file'' does not add the aliases specified there-in, you must also ``source'' the file. - cchheecckk--ttrraaddiittiioonnaall--ppggpp (default: ESC P) + check-traditional-pgp (default: ESC P) This function will search the current message for content signed or encrypted with PGP the "traditional" way, that is, without proper MIME @@ -741,12 +742,12 @@ content types of the body parts containing PGP data; this is similar to the ``edit-type'' function's effect. - ddiissppllaayy--ttooggggllee--wweeeedd (default: h) + display-toggle-weed (default: h) Toggles the weeding of message header fields specified by ``ignore'' commands. - eeddiitt (default: e) + edit (default: e) This command (available in the ``index'' and ``pager'') allows you to edit the raw current message as it's present in the mail folder. @@ -754,7 +755,7 @@ to the current folder, and the original message will be marked for deletion. - eeddiitt--ttyyppee + edit-type (default: ^E on the attachment menu, and in the pager and index menus; ^T on the compose menu) @@ -769,24 +770,24 @@ There, it's used to fine-tune the properties of attachments you are going to send. - eenntteerr--ccoommmmaanndd (default: ``:'') + enter-command (default: ``:'') This command is used to execute any command you would normally put in a configuration file. A common use is to check the settings of variables, or in conjunction with ``macros'' to change settings on the fly. - eexxttrraacctt--kkeeyyss (default: ^K) + extract-keys (default: ^K) This command extracts PGP public keys from the current or tagged message(s) and adds them to your PGP public key ring. - ffoorrggeett--ppaasssspphhrraassee (default: ^F) + forget-passphrase (default: ^F) This command wipes the passphrase(s) from memory. It is useful, if you misspelled the passphrase. - lliisstt--rreeppllyy (default: L) + list-reply (default: L) Reply to the current or tagged message(s) by extracting any addresses which match the addresses given by the ``lists or subscribe'' @@ -795,14 +796,14 @@ replying to messages posted to mailing lists helps avoid duplicate copies being sent to the author of the message you are replying to. - ppiippee--mmeessssaaggee (default: |) + pipe-message (default: |) Asks for an external Unix command and pipes the current or tagged message(s) to it. The variables ``$pipe_decode'', ``$pipe_split'', ``$pipe_sep'' and ``$wait_key'' control the exact behaviour of this function. - rreesseenndd--mmeessssaaggee (default: ESC e) + resend-message (default: ESC e) With resend-message, mutt takes the current message as a template for a new message. This function is best described as "recall from @@ -902,32 +903,32 @@ ``$status_format'' will change to a 'A' to indicate that you are in attach-message mode. - 22..44..11.. EEddiittiinngg tthhee mmeessssaaggee hheeaaddeerr + 2.4.1. Editing the message header When editing the header of your outgoing message, there are a couple of special features available. If you specify - Fcc: _f_i_l_e_n_a_m_e - Mutt will pick up _f_i_l_e_n_a_m_e just as if you had used the _e_d_i_t_-_f_c_c - function in the _c_o_m_p_o_s_e menu. + Fcc: filename + Mutt will pick up filename just as if you had used the edit-fcc + function in the compose menu. You can also attach files to your message by specifying - Attach: _f_i_l_e_n_a_m_e [ _d_e_s_c_r_i_p_t_i_o_n ] - where _f_i_l_e_n_a_m_e is the file to attach and _d_e_s_c_r_i_p_t_i_o_n is an optional + Attach: filename [ description ] + where filename is the file to attach and description is an optional string to use as the description of the attached file. - When replying to messages, if you remove the _I_n_-_R_e_p_l_y_-_T_o_: field from - the header field, Mutt will not generate a _R_e_f_e_r_e_n_c_e_s_: field, which + When replying to messages, if you remove the In-Reply-To: field from + the header field, Mutt will not generate a References: field, which allows you to create a new message thread. Also see ``edit_headers''. - 22..44..22.. UUssiinngg MMuutttt wwiitthh PPGGPP + 2.4.2. Using Mutt with PGP If you want to use PGP, you can specify - Pgp: [ E | S | S ] + Pgp: [ E | S | S ] ``E'' encrypts, ``S'' signs and ``S'' signs with the given key, setting ``$pgp_sign_as'' permanently. @@ -963,24 +964,24 @@ The capabilities field (%c) expands to a two-character sequence representing a key's capabilities. The first character gives the - key's encryption capabilities: A minus sign (--) means that the key - cannot be used for encryption. A dot (..) means that it's marked as a + key's encryption capabilities: A minus sign (-) means that the key + cannot be used for encryption. A dot (.) means that it's marked as a signature key in one of the user IDs, but may also be used for - encryption. The letter ee indicates that this key can be used for + encryption. The letter e indicates that this key can be used for encryption. The second character indicates the key's signing capabilities. Once - again, a ``--'' implies ``not for signing'', ``..'' implies that the key - is marked as an encryption key in one of the user-ids, and ``ss'' + again, a ``-'' implies ``not for signing'', ``.'' implies that the key + is marked as an encryption key in one of the user-ids, and ``s'' denotes a key which can be used for signing. Finally, the validity field (%t) indicates how well-certified a user- - id is. A question mark (??) indicates undefined validity, a minus - character (--) marks an untrusted association, a space character means - a partially trusted association, and a plus character (++) indicates + id is. A question mark (?) indicates undefined validity, a minus + character (-) marks an untrusted association, a space character means + a partially trusted association, and a plus character (+) indicates complete validity. - 22..44..33.. SSeennddiinngg aannoonnyymmoouuss mmeessssaaggeess vviiaa mmiixxmmaasstteerr.. + 2.4.3. Sending anonymous messages via mixmaster. You may also have configured mutt to co-operate with Mixmaster, an anonymous remailer. Mixmaster permits you to send your messages @@ -1016,7 +1017,7 @@ the other capabilities, please have a look at the mixmaster documentation. - 22..55.. FFoorrwwaarrddiinngg aanndd BBoouunncciinngg MMaaiill + 2.5. Forwarding and Bouncing Mail Bouncing and forwarding let you send an existing message to recipients that you specify. Bouncing a message uses the ``sendmail'' command to @@ -1035,7 +1036,7 @@ variable. Decoding of attachments, like in the pager, can be controlled by the ``$forward_decode'' and ``$mime_forward_decode'' variables, respectively. The desired forwarding format may depend on - the content, therefore _$_m_i_m_e___f_o_r_w_a_r_d is a quadoption which, for + the content, therefore $mime_forward is a quadoption which, for example, can be set to ``ask-no''. The inclusion of headers is controlled by the current setting of the @@ -1091,7 +1092,6 @@ .muttrc is the file where you will usually place your ``commands'' to configure Mutt. - In addition, mutt supports version specific configuration files that are parsed instead of the default files as explained above. For instance, if your system has a Muttrc-0.88 file in the system @@ -1103,7 +1103,7 @@ number is the same which is visible using the ``-v'' ``command line'' switch or using the show-version key (default: V) from the index menu. - 33..11.. SSyynnttaaxx ooff IInniittiiaalliizzaattiioonn FFiilleess + 3.1. Syntax of Initialization Files An initialization file consists of a series of ``commands''. Each line of the file may contain one or more commands. When multiple @@ -1125,7 +1125,7 @@ literal string (one that is not interpreted for shell variables or quoting with a backslash [see next paragraph]), while double quotes indicate a string for which should be evaluated. For example, - backtics are evaluated inside of double quotes, but nnoott for single + backtics are evaluated inside of double quotes, but not for single quotes. \ quotes the next character, just as in shells such as bash and zsh. @@ -1163,21 +1163,21 @@ The commands understood by mutt are explained in the next paragraphs. For a complete list, see the ``command reference''. - 33..22.. DDeeffiinniinngg//UUssiinngg aalliiaasseess + 3.2. Defining/Using aliases - Usage: alias _k_e_y _a_d_d_r_e_s_s [ , _a_d_d_r_e_s_s, ... ] + Usage: alias key address [ , address, ... ] It's usually very cumbersome to remember or type out the address of someone you are communicating with. Mutt allows you to create ``aliases'' which map a short string to a full address. - NNoottee:: if you want to create an alias for a group (by specifying more - than one address), you mmuusstt separate the addresses with a comma + Note: if you want to create an alias for a group (by specifying more + than one address), you must separate the addresses with a comma (``,''). To remove an alias or aliases (``*'' means all aliases): - unalias [ * | _k_e_y _._._. ] + unalias [ * | key ... ] alias muttdude me@cs.hmc.edu (Michael Elkins) alias theguys manny, moe, jack @@ -1194,7 +1194,6 @@ that Mutt will happily append aliases to any file, but in order for the new aliases to take effect you need to explicitly ``source'' this file too. - For example: source /usr/local/share/Mutt.aliases @@ -1202,7 +1201,7 @@ set alias_file=~/.mail_aliases To use aliases, you merely use the alias at any place in mutt where - mutt prompts for addresses, such as the _T_o_: or _C_c_: prompt. You can + mutt prompts for addresses, such as the To: or Cc: prompt. You can also enter aliases in your editor at the appropriate headers if you have the ``$edit_headers'' variable set. @@ -1214,20 +1213,21 @@ or after a comma denoting multiple addresses. In the alias menu, you can select as many aliases as you want with the - _s_e_l_e_c_t_-_e_n_t_r_y key (default: RET), and use the _e_x_i_t key (default: q) to + select-entry key (default: RET), and use the exit key (default: q) to return to the address prompt. - 33..33.. CChhaannggiinngg tthhee ddeeffaauulltt kkeeyy bbiinnddiinnggss + 3.3. Changing the default key bindings - Usage: bind _m_a_p _k_e_y _f_u_n_c_t_i_o_n + Usage: bind map key function This command allows you to change the default key bindings (operation invoked when pressing a key). - _m_a_p specifies in which menu the binding belongs. The currently - defined maps are: + map specifies in which menu the binding belongs. Multiple maps may be + specified by separating them with commas (no additional whitespace is + allowed). The currently defined maps are: - ggeenneerriicc + generic This is not a real menu, but is used as a fallback for all of the other menus except for the pager and editor modes. If a key is not defined in another menu, Mutt will look for a binding to @@ -1235,85 +1235,85 @@ function in multiple menus instead of having multiple bind statements to accomplish the same task. - aalliiaass + alias The alias menu is the list of your personal aliases as defined in your muttrc. It is the mapping from a short alias name to the full email address(es) of the recipient(s). - aattttaacchh + attach The attachment menu is used to access the attachments on received messages. - bbrroowwsseerr + browser The browser is used for both browsing the local directory structure, and for listing all of your incoming mailboxes. - eeddiittoorr + editor The editor is the line-based editor the user enters text data. - iinnddeexx + index The index is the list of messages contained in a mailbox. - ccoommppoossee + compose The compose menu is the screen used when sending a new message. - ppaaggeerr + pager The pager is the mode used to display message/attachment data, and help listings. - ppggpp + pgp The pgp menu is used to select the OpenPGP keys used for encrypting outgoing messages. - ppoossttppoonnee + postpone The postpone menu is similar to the index menu, except is used when recalling a message the user was composing, but saved until later. - _k_e_y is the key (or key sequence) you wish to bind. To specify a - control character, use the sequence _\_C_x, where _x is the letter of the + key is the key (or key sequence) you wish to bind. To specify a + control character, use the sequence \Cx, where x is the letter of the control character (for example, to specify control-A use ``\Ca''). - Note that the case of _x as well as _\_C is ignored, so that _\_C_A_, _\_C_a_, - _\_c_A and _\_c_a are all equivalent. An alternative form is to specify the + Note that the case of x as well as \C is ignored, so that \CA, \Ca, + \cA and \ca are all equivalent. An alternative form is to specify the key as a three digit octal number prefixed with a ``\'' (for example - _\_1_7_7 is equivalent to _\_c_?). - - In addition, _k_e_y may consist of: - - \t tab - tab - \r carriage return - \n newline - \e escape - escape - up arrow - down arrow - left arrow - right arrow - Page Up - Page Down - Backspace - Delete - Insert - Enter - Return - Home - End - Space bar - function key 1 - function key 10 - - _k_e_y does not need to be enclosed in quotes unless it contains a space + \177 is equivalent to \c?). + + In addition, key may consist of: + + \t tab + tab + \r carriage return + \n newline + \e escape + escape + up arrow + down arrow + left arrow + right arrow + Page Up + Page Down + Backspace + Delete + Insert + Enter + Return + Home + End + Space bar + function key 1 + function key 10 + + key does not need to be enclosed in quotes unless it contains a space (`` ''). - _f_u_n_c_t_i_o_n specifies which action to take when _k_e_y is pressed. For a + function specifies which action to take when key is pressed. For a complete list of functions, see the ``reference''. The special function noop unbinds the specified key sequence. - 33..44.. DDeeffiinniinngg aalliiaasseess ffoorr cchhaarraacctteerr sseettss + 3.4. Defining aliases for character sets - Usage: charset-hook _a_l_i_a_s _c_h_a_r_s_e_t - Usage: iconv-hook _c_h_a_r_s_e_t _l_o_c_a_l_-_c_h_a_r_s_e_t + Usage: charset-hook alias charset + Usage: iconv-hook charset local-charset The charset-hook command defines an alias for a character set. This is useful to properly display messages which are tagged with a @@ -1323,50 +1323,55 @@ set. This is helpful when your systems character conversion library insists on using strange, system-specific names for character sets. - 33..55.. SSeettttiinngg vvaarriiaabblleess bbaasseedd uuppoonn mmaaiillbbooxx + 3.5. Setting variables based upon mailbox - Usage: folder-hook [!]_r_e_g_e_x_p _c_o_m_m_a_n_d + Usage: folder-hook [!]regexp command It is often desirable to change settings based on which mailbox you are reading. The folder-hook command provides a method by which you - can execute any configuration command. _r_e_g_e_x_p is a regular expression - specifying in which mailboxes to execute _c_o_m_m_a_n_d before loading. If a + can execute any configuration command. regexp is a regular expression + specifying in which mailboxes to execute command before loading. If a mailbox matches multiple folder-hook's, they are executed in the order given in the muttrc. - NNoottee:: if you use the ``!'' shortcut for ``$spoolfile'' at the + Note: if you use the ``!'' shortcut for ``$spoolfile'' at the beginning of the pattern, you must place it inside of double or single - quotes in order to distinguish it from the logical _n_o_t operator for + quotes in order to distinguish it from the logical not operator for the expression. - Note that the settings are _n_o_t restored when you leave the mailbox. + Note that the settings are not restored when you leave the mailbox. For example, a command action to perform is to change the sorting method based upon the mailbox being read: folder-hook mutt set sort=threads However, the sorting method is not restored to its previous value when - reading a different mailbox. To specify a _d_e_f_a_u_l_t command, use the + reading a different mailbox. To specify a default command, use the pattern ``.'': folder-hook . set sort=date-sent - 33..66.. KKeeyybbooaarrdd mmaaccrrooss + 3.6. Keyboard macros - Usage: macro _m_e_n_u _k_e_y _s_e_q_u_e_n_c_e [ _d_e_s_c_r_i_p_t_i_o_n ] + Usage: macro menu key sequence [ description ] Macros are useful when you would like a single key to perform a series - of actions. When you press _k_e_y in menu _m_e_n_u, Mutt will behave as if - you had typed _s_e_q_u_e_n_c_e. So if you have a common sequence of commands + of actions. When you press key in menu menu, Mutt will behave as if + you had typed sequence. So if you have a common sequence of commands you type, you can create a macro to execute those commands with a single key. - _k_e_y and _s_e_q_u_e_n_c_e are expanded by the same rules as the ``key + menu is the ``map'' which the macro will be bound. Multiple maps may + be specified by separating multiple menu arguments by commas. + Whitespace may not be used in between the menu arguments and the + commas separating them. + + key and sequence are expanded by the same rules as the ``key bindings''. There are some additions however. The first is that - control characters in _s_e_q_u_e_n_c_e can also be specified as _^_x. In order - to get a caret (`^'') you need to use _^_^. Secondly, to specify a - certain key such as _u_p or to invoke a function directly, you can use - the format _<_k_e_y _n_a_m_e_> and _<_f_u_n_c_t_i_o_n _n_a_m_e_>. For a listing of key names + control characters in sequence can also be specified as ^x. In order + to get a caret (`^'') you need to use ^^. Secondly, to specify a + certain key such as up or to invoke a function directly, you can use + the format  and . For a listing of key names see the section on ``key bindings''. Functions are listed in the ``function reference''. @@ -1376,39 +1381,39 @@ them more robust and portable, and also facilitates defining of macros in files used by more than one user (eg. the system Muttrc). - Optionally you can specify a descriptive text after _s_e_q_u_e_n_c_e, which is + Optionally you can specify a descriptive text after sequence, which is shown in the help screens. - NNoottee:: Macro definitions (if any) listed in the help screen(s), are + Note: Macro definitions (if any) listed in the help screen(s), are silently truncated at the screen width, and are not wrapped. - 33..77.. UUssiinngg ccoolloorr aanndd mmoonnoo vviiddeeoo aattttrriibbuutteess + 3.7. Using color and mono video attributes - Usage: color _o_b_j_e_c_t _f_o_r_e_g_r_o_u_n_d _b_a_c_k_g_r_o_u_n_d [ _r_e_g_e_x_p ] - Usage: color index _f_o_r_e_g_r_o_u_n_d _b_a_c_k_g_r_o_u_n_d _p_a_t_t_e_r_n - Usage: uncolor index _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ] + Usage: color object foreground background [ regexp ] + Usage: color index foreground background pattern + Usage: uncolor index pattern [ pattern ... ] If your terminal supports color, you can spice up Mutt by creating your own color scheme. To define the color of an object (type of - information), you must specify both a foreground color aanndd a + information), you must specify both a foreground color and a background color (it is not possible to only specify one or the other). - _o_b_j_e_c_t can be one of: + object can be one of: · attachment - · body (match _r_e_g_e_x_p in the body of messages) + · body (match regexp in the body of messages) · bold (hiliting bold patterns in the body of messages) · error (error messages printed by Mutt) - · header (match _r_e_g_e_x_p in the message header) + · header (match regexp in the message header) · hdrdefault (default color of the message header in the pager) - · index (match _p_a_t_t_e_r_n in the message index) + · index (match pattern in the message index) · indicator (arrow or bar used to indicate the current item in a menu) @@ -1422,7 +1427,7 @@ · quoted (text matching ``$quote_regexp'' in the body of a message) - · quoted1, quoted2, ..., quotedNN (higher levels of quoting) + · quoted1, quoted2, ..., quotedN (higher levels of quoting) · search (hiliting of words in the pager) @@ -1437,7 +1442,7 @@ · underline (hiliting underlined patterns in the body of messages) - _f_o_r_e_g_r_o_u_n_d and _b_a_c_k_g_r_o_u_n_d can be one of the following: + foreground and background can be one of the following: · white @@ -1457,43 +1462,43 @@ · default - · color_x + · colorx - _f_o_r_e_g_r_o_u_n_d can optionally be prefixed with the keyword bright to make + foreground can optionally be prefixed with the keyword bright to make the foreground color boldfaced (e.g., brightred). - If your terminal supports it, the special keyword _d_e_f_a_u_l_t can be used - as a transparent color. The value _b_r_i_g_h_t_d_e_f_a_u_l_t is also valid. If - Mutt is linked against the _S_-_L_a_n_g library, you also need to set the - _C_O_L_O_R_F_G_B_G environment variable to the default colors of your terminal + If your terminal supports it, the special keyword default can be used + as a transparent color. The value brightdefault is also valid. If + Mutt is linked against the S-Lang library, you also need to set the + COLORFGBG environment variable to the default colors of your terminal for this to work; for example (for Bourne-like shells): set COLORFGBG="green;black" export COLORFGBG - NNoottee:: The _S_-_L_a_n_g library requires you to use the _l_i_g_h_t_g_r_a_y and _b_r_o_w_n - keywords instead of _w_h_i_t_e and _y_e_l_l_o_w when setting this variable. + Note: The S-Lang library requires you to use the lightgray and brown + keywords instead of white and yellow when setting this variable. - NNoottee:: The uncolor command can be applied to the index object only. It - removes entries from the list. You mmuusstt specify the same pattern + Note: The uncolor command can be applied to the index object only. It + removes entries from the list. You must specify the same pattern specified in the color command for it to be removed. The pattern ``*'' is a special token which means to clear the color index list of all entries. - Mutt also recognizes the keywords _c_o_l_o_r_0, _c_o_l_o_r_1, ..., _c_o_l_o_rNN--11 (NN + Mutt also recognizes the keywords color0, color1, ..., colorN-1 (N being the number of colors supported by your terminal). This is useful when you remap the colors for your display (for example by - changing the color associated with _c_o_l_o_r_2 for your xterm), since color + changing the color associated with color2 for your xterm), since color names may then lose their normal meaning. If your terminal does not support color, it is still possible change the video attributes through the use of the ``mono'' command: - Usage: mono _<_o_b_j_e_c_t_> _<_a_t_t_r_i_b_u_t_e_> [ _r_e_g_e_x_p ] - Usage: mono index _a_t_t_r_i_b_u_t_e _p_a_t_t_e_r_n - Usage: unmono index _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ] + Usage: mono   [ regexp ] + Usage: mono index attribute pattern + Usage: unmono index pattern [ pattern ... ] - where _a_t_t_r_i_b_u_t_e is one of the following: + where attribute is one of the following: · none @@ -1505,9 +1510,9 @@ · standout - 33..88.. IIggnnoorriinngg ((wweeeeddiinngg)) uunnwwaanntteedd mmeessssaaggee hheeaaddeerrss + 3.8. Ignoring (weeding) unwanted message headers - Usage: [un]ignore _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ] + Usage: [un]ignore pattern [ pattern ... ] Messages often have many header fields added by automatic processing systems, or which may not seem useful to display on the screen. This @@ -1533,9 +1538,9 @@ unignore organization organisation x-mailer: x-newsreader: x-mailing-list: unignore posted-to: - 33..99.. AAlltteerrnnaattiivvee aaddddrreesssseess + 3.9. Alternative addresses - Usage: [un]alternates _r_e_g_e_x_p [ _r_e_g_e_x_p ... ] + Usage: [un]alternates regexp [ regexp ... ] With various functions, mutt will treat messages differently, depending on whether you sent them or whether you received them from @@ -1553,10 +1558,10 @@ To remove a regular expression from this list, use the unalternates command. - 33..1100.. MMaaiilliinngg lliissttss + 3.10. Mailing lists - Usage: [un]lists _r_e_g_e_x_p [ _r_e_g_e_x_p ... ] - Usage: [un]subscribe _r_e_g_e_x_p [ _r_e_g_e_x_p ... ] + Usage: [un]lists regexp [ regexp ... ] + Usage: [un]subscribe regexp [ regexp ... ] Mutt has a few nice features for ``handling mailing lists''. In order to take advantage of them, you must specify which addresses belong to @@ -1584,12 +1589,12 @@ Specify as much of the address as you need to to remove ambiguity. For example, if you've subscribed to the Mutt mailing list, you will - receive mail addresssed to _m_u_t_t_-_u_s_e_r_s_@_m_u_t_t_._o_r_g. So, to tell Mutt that + receive mail addresssed to mutt-users@mutt.org. So, to tell Mutt that this is a mailing list, you could add ``lists mutt-users'' to your initialization file. To tell mutt that you are subscribed to it, add ``subscribe mutt-users'' to your initialization file instead. If you - also happen to get mail from someone whose address is _m_u_t_t_- - _u_s_e_r_s_@_e_x_a_m_p_l_e_._c_o_m, you could use ``lists mutt-users@mutt.org'' or + also happen to get mail from someone whose address is mutt- + users@example.com, you could use ``lists mutt-users@mutt.org'' or ``subscribe mutt-users@mutt.org'' to match only mail from the actual list. @@ -1600,29 +1605,29 @@ To remove a mailing list from the list of subscribed mailing lists, but keep it on the list of known mailing lists, use ``unsubscribe''. - 33..1111.. UUssiinngg MMuullttiippllee ssppooooll mmaaiillbbooxxeess + 3.11. Using Multiple spool mailboxes - Usage: mbox-hook [!]_p_a_t_t_e_r_n _m_a_i_l_b_o_x + Usage: mbox-hook [!]pattern mailbox This command is used to move read messages from a specified mailbox to a different mailbox automatically when you quit or change folders. - _p_a_t_t_e_r_n is a regular expression specifying the mailbox to treat as a - ``spool'' mailbox and _m_a_i_l_b_o_x specifies where mail should be saved + pattern is a regular expression specifying the mailbox to treat as a + ``spool'' mailbox and mailbox specifies where mail should be saved when read. - Unlike some of the other _h_o_o_k commands, only the _f_i_r_s_t matching + Unlike some of the other hook commands, only the first matching pattern is used (it is not possible to save read mail in more than a single mailbox). - 33..1122.. DDeeffiinniinngg mmaaiillbbooxxeess wwhhiicchh rreecceeiivvee mmaaiill + 3.12. Defining mailboxes which receive mail - Usage: [un]mailboxes [!]_f_i_l_e_n_a_m_e [ _f_i_l_e_n_a_m_e ... ] + Usage: [un]mailboxes [!]filename [ filename ... ] This command specifies folders which can receive mail and which will be checked for new messages. By default, the main menu status bar displays how many of these folders have new messages. - When changing folders, pressing _s_p_a_c_e will cycle through folders with + When changing folders, pressing space will cycle through folders with new mail. Pressing TAB in the directory browser will bring up a menu showing the @@ -1634,23 +1639,23 @@ folders which receive mail. Use ``unmailboxes *'' to remove all tokens. - NNoottee:: new mail is detected by comparing the last modification time to + Note: new mail is detected by comparing the last modification time to the last access time. Utilities like biff or frm or any other program which accesses the mailbox might cause Mutt to never detect new mail for that mailbox if they do not properly reset the access time. Backup tools are another common reason for updated access times. - NNoottee:: the filenames in the mailboxes command are resolved when the + Note: the filenames in the mailboxes command are resolved when the command is executed, so if these names contain ``shortcut characters'' (such as ``='' and ``!''), any variable definition that affect these characters (like ``$folder'' and ``$spoolfile'') should be executed before the mailboxes command. - 33..1133.. UUsseerr ddeeffiinneedd hheeaaddeerrss + 3.13. User defined headers Usage: - my_hdr _s_t_r_i_n_g - unmy_hdr _f_i_e_l_d [ _f_i_e_l_d ... ] + my_hdr string + unmy_hdr field [ field ... ] The ``my_hdr'' command allows you to create your own header fields which will be added to every message you send. @@ -1662,13 +1667,13 @@ in your .muttrc. - NNoottee:: space characters are _n_o_t allowed between the keyword and the + Note: space characters are not allowed between the keyword and the colon (``:''). The standard for electronic mail (RFC822) says that space is illegal there, so Mutt enforces the rule. If you would like to add a header field to a single message, you - should either set the ``edit_headers'' variable, or use the _e_d_i_t_- - _h_e_a_d_e_r_s function (default: ``E'') in the send-menu so that you can + should either set the ``edit_headers'' variable, or use the edit- + headers function (default: ``E'') in the send-menu so that you can edit the header of your message along with the body. To remove user defined header fields, use the ``unmy_hdr'' command. @@ -1678,9 +1683,9 @@ unmy_hdr to cc - 33..1144.. DDeeffiinniinngg tthhee oorrddeerr ooff hheeaaddeerrss wwhheenn vviieewwiinngg mmeessssaaggeess + 3.14. Defining the order of headers when viewing messages - Usage: hdr_order _h_e_a_d_e_r_1 _h_e_a_d_e_r_2 _h_e_a_d_e_r_3 + Usage: hdr_order header1 header2 header3 With this command, you can specify an order in which mutt will attempt to present headers to you when viewing messages. @@ -1691,17 +1696,17 @@ hdr_order From Date: From: To: Cc: Subject: - 33..1155.. SSppeecciiffyy ddeeffaauulltt ssaavvee ffiilleennaammee + 3.15. Specify default save filename - Usage: save-hook [!]_p_a_t_t_e_r_n _f_i_l_e_n_a_m_e + Usage: save-hook [!]pattern filename This command is used to override the default filename used when saving - messages. _f_i_l_e_n_a_m_e will be used as the default filename if the - message is _F_r_o_m_: an address matching _r_e_g_e_x_p or if you are the author - and the message is addressed _t_o_: something matching _r_e_g_e_x_p. + messages. filename will be used as the default filename if the + message is From: an address matching regexp or if you are the author + and the message is addressed to: something matching regexp. See ``Message Matching in Hooks'' for information on the exact format - of _p_a_t_t_e_r_n. + of pattern. Examples: @@ -1710,18 +1715,18 @@ Also see the ``fcc-save-hook'' command. - 33..1166.. SSppeecciiffyy ddeeffaauulltt FFcccc:: mmaaiillbbooxx wwhheenn ccoommppoossiinngg + 3.16. Specify default Fcc: mailbox when composing - Usage: fcc-hook [!]_p_a_t_t_e_r_n _m_a_i_l_b_o_x + Usage: fcc-hook [!]pattern mailbox This command is used to save outgoing mail in a mailbox other than ``$record''. Mutt searches the initial list of message recipients for - the first matching _r_e_g_e_x_p and uses _m_a_i_l_b_o_x as the default Fcc: + the first matching regexp and uses mailbox as the default Fcc: mailbox. If no match is found the message will be saved to ``$record'' mailbox. See ``Message Matching in Hooks'' for information on the exact format - of _p_a_t_t_e_r_n. + of pattern. Example: fcc-hook aol.com$ +spammers @@ -1729,35 +1734,42 @@ to the `+spammers' mailbox by default. Also see the ``fcc-save-hook'' command. - 33..1177.. SSppeecciiffyy ddeeffaauulltt ssaavvee ffiilleennaammee aanndd ddeeffaauulltt FFcccc:: mmaaiillbbooxx aatt oonnccee + 3.17. Specify default save filename and default Fcc: mailbox at once - Usage: fcc-save-hook [!]_p_a_t_t_e_r_n _m_a_i_l_b_o_x + Usage: fcc-save-hook [!]pattern mailbox This command is a shortcut, equivalent to doing both a ``fcc-hook'' and a ``save-hook'' with its arguments. - 33..1188.. CChhaannggee sseettttiinnggss bbaasseedd uuppoonn mmeessssaaggee rreecciippiieennttss + 3.18. Change settings based upon message recipients - Usage: reply-hook [!]_p_a_t_t_e_r_n _c_o_m_m_a_n_d - Usage: send-hook [!]_p_a_t_t_e_r_n _c_o_m_m_a_n_d + Usage: reply-hook [!]pattern command + Usage: send-hook [!]pattern command + Usage: send2-hook [!]pattern command These commands can be used to execute arbitrary configuration commands - based upon recipients of the message. _p_a_t_t_e_r_n is a regular expression - matching the desired address. _c_o_m_m_a_n_d is executed when _r_e_g_e_x_p matches + based upon recipients of the message. pattern is a regular expression + matching the desired address. command is executed when regexp matches recipients of the message. - reply-hook is matched against the message you are _r_e_p_l_y_i_n_g ttoo, instead - of the message you are _s_e_n_d_i_n_g. send-hook is matched against all - messages, both _n_e_w and _r_e_p_l_i_e_s. NNoottee:: reply-hooks are matched bbeeffoorree - the send-hook, rreeggaarrddlleessss of the order specified in the users's + reply-hook is matched against the message you are replying to, instead + of the message you are sending. send-hook is matched against all + messages, both new and replies. Note: reply-hooks are matched before + the send-hook, regardless of the order specified in the users's configuration file. - For each type of send-hook or reply-hook, When multiple matches occur, + send2-hook is matched every time a message is changed, either by + editing it, or by using the compose menu to change its recipients or + subject. send2-hook is executed after send-hook, and can, e.g., be + used to set parameters such as the ``$sendmail'' variable depending on + the message's sender address. + + For each type of send-hook or reply-hook, when multiple matches occur, commands are executed in the order they are specified in the muttrc (for that type of hook). See ``Message Matching in Hooks'' for information on the exact format - of _p_a_t_t_e_r_n. + of pattern. Example: send-hook mutt "set mime_forward signature=''" @@ -1766,34 +1778,34 @@ change the language of the attributions and signatures based upon the recipients. - NNoottee:: the send-hook's are only executed ONCE after getting the initial + Note: the send-hook's are only executed ONCE after getting the initial list of recipients. Adding a recipient after replying or editing the message will NOT cause any send-hook to be executed. Also note that my_hdr commands which modify recipient headers, or the message's subject, don't have any effect on the current message when executed from a send-hook. - 33..1199.. CChhaannggee sseettttiinnggss bbeeffoorree ffoorrmmaattttiinngg aa mmeessssaaggee + 3.19. Change settings before formatting a message - Usage: message-hook [!]_p_a_t_t_e_r_n _c_o_m_m_a_n_d + Usage: message-hook [!]pattern command This command can be used to execute arbitrary configuration commands before viewing or formatting a message based upon information about - the message. _c_o_m_m_a_n_d is executed if the _p_a_t_t_e_r_n matches the message + the message. command is executed if the pattern matches the message to be displayed. When multiple matches occur, commands are executed in the order they are specified in the muttrc. See ``Message Matching in Hooks'' for information on the exact format - of _p_a_t_t_e_r_n. + of pattern. Example: message-hook ~A 'set pager=builtin' message-hook '~f freshmeat-news' 'set pager="less \"+/^ subject: .*\""' - 33..2200.. CChhoooossiinngg tthhee ccrryyppttooggrraapphhiicc kkeeyy ooff tthhee rreecciippiieenntt + 3.20. Choosing the cryptographic key of the recipient - Usage: crypt-hook _p_a_t_t_e_r_n _k_e_y_i_d + Usage: crypt-hook pattern keyid When encrypting messages with PGP or OpenSSL, you may want to associate a certain key with a given e-mail address automatically, @@ -1807,9 +1819,9 @@ can either put a numerical key ID here, an e-mail address, or even just a real name. - 33..2211.. AAddddiinngg kkeeyy sseeqquueenncceess ttoo tthhee kkeeyybbooaarrdd bbuuffffeerr + 3.21. Adding key sequences to the keyboard buffer - Usage: push _s_t_r_i_n_g + Usage: push string This command adds the named string to the keyboard buffer. The string may contain control characters, key names and function names like the @@ -1817,63 +1829,154 @@ automatically run a sequence of commands at startup, or when entering certain folders. - 33..2222.. EExxeeccuuttiinngg ffuunnccttiioonnss + 3.22. Executing functions - Usage: exec _f_u_n_c_t_i_o_n [ _f_u_n_c_t_i_o_n ... ] + Usage: exec function [ function ... ] This command can be used to execute any function. Functions are listed in the ``function reference''. ``exec function'' is equivalent to ``push ''. + 3.23. Message Scoring - 33..2233.. MMeessssaaggee SSccoorriinngg - - Usage: score _p_a_t_t_e_r_n _v_a_l_u_e - Usage: unscore _p_a_t_t_e_r_n [ _p_a_t_t_e_r_n ... ] + Usage: score pattern value + Usage: unscore pattern [ pattern ... ] - The score commands adds _v_a_l_u_e to a message's score if _p_a_t_t_e_r_n matches - it. _p_a_t_t_e_r_n is a string in the format described in the ``patterns'' + The score commands adds value to a message's score if pattern matches + it. pattern is a string in the format described in the ``patterns'' section (note: For efficiency reasons, patterns which scan information not available in the index, such as ~b, ~B or ~h, may not be used). - _v_a_l_u_e is a positive or negative integer. A message's final score is + value is a positive or negative integer. A message's final score is the sum total of all matching score entries. However, you may - optionally prefix _v_a_l_u_e with an equal sign (=) to cause evaluation to + optionally prefix value with an equal sign (=) to cause evaluation to stop at a particular entry if there is a match. Negative final scores are rounded up to 0. - The unscore command removes score entries from the list. You mmuusstt + The unscore command removes score entries from the list. You must specify the same pattern specified in the score command for it to be removed. The pattern ``*'' is a special token which means to clear the list of all score entries. - 33..2244.. SSeettttiinngg vvaarriiaabblleess - - Usage: set [no|inv]_v_a_r_i_a_b_l_e[=_v_a_l_u_e] [ _v_a_r_i_a_b_l_e ... ] - Usage: toggle _v_a_r_i_a_b_l_e [_v_a_r_i_a_b_l_e ... ] - Usage: unset _v_a_r_i_a_b_l_e [_v_a_r_i_a_b_l_e ... ] - Usage: reset _v_a_r_i_a_b_l_e [_v_a_r_i_a_b_l_e ... ] + 3.24. Spam detection + + Usage: spam pattern format + Usage: nospam pattern + + Mutt has generalized support for external spam-scoring filters. By + defining your spam patterns with the spam and nospam commands, you can + limit, search, and sort your mail based on its spam attributes, as + determined by the external filter. You also can display the spam + attributes in your index display using the %H selector in the + ``$index_format'' variable. (Tip: try %?H?[%H] ? to display spam tags + only when they are defined for a given message.) + + Your first step is to define your external filter's spam patterns + using the spam command. pattern should be a regular expression that + matches a header in a mail message. If any message in the mailbox + matches this regular expression, it will receive a ``spam tag'' or + ``spam attribute'' (unless it also matches a nospam pattern -- see + below.) The appearance of this attribute is entirely up to you, and is + governed by the format parameter. format can be any static text, but + it also can include back-references from the pattern expression. (A + regular expression ``back-reference'' refers to a sub-expression + contained within parentheses.) %1 is replaced with the first back- + reference in the regex, %2 with the second, etc. + + If you're using multiple spam filters, a message can have more than + one spam-related header. You can define spam patterns for each filter + you use. If a message matches two or more of these patterns, and the + $spam_separator variable is set to a string, then the message's spam + tag will consist of all the format strings joined together, with the + value of $spam_separator separating them. + + For example, suppose I use DCC, SpamAssassin, and PureMessage. I might + define these spam settings: + + spam "X-DCC-.*-Metrics:.*(....)=many" "90+/DCC-%1" + spam "X-Spam-Status: Yes" "90+/SA" + spam "X-PerlMX-Spam: .*Probability=([0-9]+)%" "%1/PM" + set spam_separator=", " + + If I then received a message that DCC registered with ``many'' hits + under the ``Fuz2'' checksum, and that PureMessage registered with a + 97% probability of being spam, that message's spam tag would read + 90+/DCC-Fuz2, 97/PM. (The four characters before ``=many'' in a DCC + report indicate the checksum used -- in this case, ``Fuz2''.) + + If the $spam_separator variable is unset, then each spam pattern match + supercedes the previous one. Instead of getting joined format strings, + you'll get only the last one to match. + + The spam tag is what will be displayed in the index when you use %H in + the $index_format variable. It's also the string that the ~H pattern- + matching expression matches against for search and limit functions. + And it's what sorting by spam attribute will use as a sort key. + + That's a pretty complicated example, and most people's actual + environments will have only one spam filter. The simpler your + configuration, the more effective mutt can be, especially when it + comes to sorting. + + Generally, when you sort by spam tag, mutt will sort lexically -- that + is, by ordering strings alphnumerically. However, if a spam tag begins + with a number, mutt will sort numerically first, and lexically only + when two numbers are equal in value. (This is like UNIX's sort -n.) A + message with no spam attributes at all -- that is, one that didn't + match any of your spam patterns -- is sorted at lowest priority. + Numbers are sorted next, beginning with 0 and ranging upward. Finally, + non-numeric strings are sorted, with ``a'' taking lower priority than + ``z''. Clearly, in general, sorting by spam tags is most effective + when you can coerce your filter to give you a raw number. But in case + you can't, mutt can still do something useful. + + The nospam command can be used to write exceptions to spam patterns. + If a header pattern matches something in a spam command, but you + nonetheless do not want it to receive a spam tag, you can list a more + precise pattern under a nospam command. + + If the pattern given to nospam is exactly the same as the pattern on + an existing spam list entry, the effect will be to remove the entry + from the spam list, instead of adding an exception. Likewise, if the + pattern for a spam command matches an entry on the nospam list, that + nospam entry will be removed. If the pattern for nospam is ``*'', all + entries on both lists will be removed. This might be the default + action if you use spam and nospam in conjunction with a folder-hook. + + You can have as many spam or nospam commands as you like. You can + even do your own primitive spam detection within mutt -- for example, + if you consider all mail from MAILER-DAEMON to be spam, you can use a + spam command like this: + + spam "^From: .*MAILER-DAEMON" "999" + + 3.25. Setting variables + + Usage: set [no|inv]variable[=value] [ variable ... ] + Usage: toggle variable [variable ... ] + Usage: unset variable [variable ... ] + Usage: reset variable [variable ... ] This command is used to set (and unset) ``configuration variables''. There are four basic types of variables: boolean, number, string and - quadoption. _b_o_o_l_e_a_n variables can be _s_e_t (true) or _u_n_s_e_t (false). - _n_u_m_b_e_r variables can be assigned a positive integer value. + quadoption. boolean variables can be set (true) or unset (false). + number variables can be assigned a positive integer value. - _s_t_r_i_n_g variables consist of any number of printable characters. - _s_t_r_i_n_g_s must be enclosed in quotes if they contain spaces or tabs. - You may also use the ``C'' escape sequences \\nn and \\tt for newline and + string variables consist of any number of printable characters. + strings must be enclosed in quotes if they contain spaces or tabs. + You may also use the ``C'' escape sequences \n and \t for newline and tab, respectively. - _q_u_a_d_o_p_t_i_o_n variables are used to control whether or not to be prompted - for certain actions, or to specify a default action. A value of _y_e_s + quadoption variables are used to control whether or not to be prompted + for certain actions, or to specify a default action. A value of yes will cause the action to be carried out automatically as if you had - answered yes to the question. Similarly, a value of _n_o will cause the + answered yes to the question. Similarly, a value of no will cause the the action to be carried out as if you had answered ``no.'' A value - of _a_s_k_-_y_e_s will cause a prompt with a default answer of ``yes'' and - _a_s_k_-_n_o will provide a default answer of ``no.'' + of ask-yes will cause a prompt with a default answer of ``yes'' and + ask-no will provide a default answer of ``no.'' Prefixing a variable with ``no'' will unset it. Example: set noaskbcc. - For _b_o_o_l_e_a_n variables, you may optionally prefix the variable name + For boolean variables, you may optionally prefix the variable name with inv to toggle the value (on or off). This is useful when writing macros. Example: set invsmart_wrap. @@ -1883,7 +1986,7 @@ The unset command automatically prepends the no prefix to all specified variables. - Using the enter-command function in the _i_n_d_e_x menu, you can query the + Using the enter-command function in the index menu, you can query the value of a variable by prefixing the name of the variable with a question mark: @@ -1900,9 +2003,9 @@ With the reset command there exists the special variable ``all'', which allows you to reset all variables to their system defaults. - 33..2255.. RReeaaddiinngg iinniittiiaalliizzaattiioonn ccoommmmaannddss ffrroomm aannootthheerr ffiillee + 3.26. Reading initialization commands from another file - Usage: source _f_i_l_e_n_a_m_e + Usage: source filename This command allows the inclusion of initialization commands from other files. For example, I place all of my aliases in @@ -1912,22 +2015,22 @@ If the filename begins with a tilde (``~''), it will be expanded to the path of your home directory. - If the filename ends with a vertical bar (|), then _f_i_l_e_n_a_m_e is + If the filename ends with a vertical bar (|), then filename is considered to be an executable program from which to read input (eg. - source ~bin/myscript|/). + source ~/bin/myscript|). - 33..2266.. RReemmoovviinngg hhooookkss + 3.27. Removing hooks - Usage: unhook [ * | _h_o_o_k_-_t_y_p_e ] + Usage: unhook [ * | hook-type ] This command permits you to flush hooks you have previously defined. You can either remove all hooks by giving the ``*'' character as an argument, or you can remove all hooks of a specific type by saying something like unhook send-hook. - 44.. AAddvvaanncceedd UUssaaggee + 4. Advanced Usage - 44..11.. RReegguullaarr EExxpprreessssiioonnss + 4.1. Regular Expressions All string patterns in Mutt including those in more complex ``patterns'' must be specified using regular expressions (regexp) in @@ -1963,8 +2066,8 @@ A list of characters enclosed by ``['' and ``]'' matches any single character in that list; if the first character of the list is a caret - ``^'' then it matches any character nnoott in the list. For example, the - regular expression [[00112233445566778899]] matches any single digit. A range of + ``^'' then it matches any character not in the list. For example, the + regular expression [0123456789] matches any single digit. A range of ASCII characters may be specified by giving the first and last characters, separated by a hyphen ``-''. Most metacharacters lose their special meaning inside lists. To include a literal ``]'' place @@ -1976,50 +2079,51 @@ consist of ``[:'', a keyword denoting the class, and ``:]''. The following classes are defined by the POSIX standard: - [[::aallnnuumm::]] + [:alnum:] Alphanumeric characters. - [[::aallpphhaa::]] + [:alpha:] Alphabetic characters. - [[::bbllaannkk::]] + [:blank:] Space or tab characters. - [[::ccnnttrrll::]] + [:cntrl:] Control characters. - [[::ddiiggiitt::]] + [:digit:] Numeric characters. - [[::ggrraapphh::]] + + [:graph:] Characters that are both printable and visible. (A space is printable, but not visible, while an ``a'' is both.) - [[::lloowweerr::]] + [:lower:] Lower-case alphabetic characters. - [[::pprriinntt::]] + [:print:] Printable characters (characters that are not control characters.) - [[::ppuunncctt::]] + [:punct:] Punctuation characters (characters that are not letter, digits, control characters, or space characters). - [[::ssppaaccee::]] + [:space:] Space characters (such as space, tab and formfeed, to name a few). - [[::uuppppeerr::]] + [:upper:] Upper-case alphabetic characters. - [[::xxddiiggiitt::]] + [:xdigit:] Characters that are hexadecimal digits. A character class is only valid in a regular expression inside the brackets of a character list. Note that the brackets in these class names are part of the symbolic names, and must be included in addition - to the brackets delimiting the bracket list. For example, [[[[::ddiiggiitt::]]]] - is equivalent to [[00--99]]. + to the brackets delimiting the bracket list. For example, [[:digit:]] + is equivalent to [0-9]. Two additional special sequences can appear in character lists. These apply to non-ASCII character sets, which can have single symbols @@ -2027,41 +2131,40 @@ character, as well as several characters that are equivalent for collating or sorting purposes: - CCoollllaattiinngg SSyymmbboollss + Collating Symbols A collating symbol is a multi-character collating element enclosed in ``[.'' and ``.]''. For example, if ``ch'' is a - collating element, then [[[[..cchh..]]]] is a regexp that matches this - collating element, while [[cchh]] is a regexp that matches either + collating element, then [[.ch.]] is a regexp that matches this + collating element, while [ch] is a regexp that matches either ``c'' or ``h''. - EEqquuiivvaalleennccee CCllaasssseess + Equivalence Classes An equivalence class is a locale-specific name for a list of characters that are equivalent. The name is enclosed in ``[='' and ``=]''. For example, the name ``e'' might be used to - represent all of ``è'' ``é'' and ``e''. In this case, [[[[==ee==]]]] + represent all of ``è'' ``é'' and ``e''. In this case, [[=e=]] is a regexp that matches any of ``è'', ``é'' and ``e''. - A regular expression matching a single character may be followed by one of several repetition operators: - ?? The preceding item is optional and matched at most once. + ? The preceding item is optional and matched at most once. - ** The preceding item will be matched zero or more times. + * The preceding item will be matched zero or more times. - ++ The preceding item will be matched one or more times. + + The preceding item will be matched one or more times. - {{nn}} - The preceding item is matched exactly _n times. + {n} + The preceding item is matched exactly n times. - {{nn,,}} - The preceding item is matched _n or more times. + {n,} + The preceding item is matched n or more times. - {{,,mm}} - The preceding item is matched at most _m times. + {,m} + The preceding item is matched at most m times. - {{nn,,mm}} - The preceding item is matched at least _n times, but no more than - _m times. + {n,m} + The preceding item is matched at least n times, but no more than + m times. Two regular expressions may be concatenated; the resulting regular expression matches any string formed by concatenating two substrings @@ -2075,83 +2178,85 @@ precedence over alternation. A whole subexpression may be enclosed in parentheses to override these precedence rules. - NNoottee:: If you compile Mutt with the GNU _r_x package, the following + Note: If you compile Mutt with the GNU rx package, the following operators may also be used in regular expressions: - \\\\yy + \\y Matches the empty string at either the beginning or the end of a word. - \\\\BB + \\B Matches the empty string within a word. - \\\\<< + \\< Matches the empty string at the beginning of a word. - \\\\>> + \\> Matches the empty string at the end of a word. - \\\\ww + \\w Matches any word-constituent character (letter, digit, or underscore). - \\\\WW + \\W Matches any character that is not word-constituent. - \\\\`` + \\` Matches the empty string at the beginning of a buffer (string). - \\\\'' + \\' Matches the empty string at the end of a buffer. Please note however that these operators are not defined by POSIX, so they may or may not be available in stock libraries on various systems. - 44..22.. PPaatttteerrnnss + 4.2. Patterns Many of Mutt's commands allow you to specify a pattern to match (limit, tag-pattern, delete-pattern, etc.). There are several ways to select messages: - ~A all messages - ~b EXPR messages which contain EXPR in the message body - ~B EXPR messages which contain EXPR in the whole message - ~c USER messages carbon-copied to USER - ~C EXPR message is either to: or cc: EXPR - ~D deleted messages - ~d [MIN]-[MAX] messages with ``date-sent'' in a Date range - ~E expired messages - ~e EXPR message which contains EXPR in the ``Sender'' field - ~F flagged messages - ~f USER messages originating from USER - ~g cryptographically signed messages - ~G cryptographically encrypted messages - ~h EXPR messages which contain EXPR in the message header - ~k message contains PGP key material - ~i ID message which match ID in the ``Message-ID'' field - ~L EXPR message is either originated or received by EXPR - ~l message is addressed to a known mailing list - ~m [MIN]-[MAX] message in the range MIN to MAX *) - ~n [MIN]-[MAX] messages with a score in the range MIN to MAX *) - ~N new messages - ~O old messages - ~p message is addressed to you (consults alternates) - ~P message is from you (consults alternates) - ~Q messages which have been replied to - ~R read messages - ~r [MIN]-[MAX] messages with ``date-received'' in a Date range - ~S superseded messages - ~s SUBJECT messages having SUBJECT in the ``Subject'' field. - ~T tagged messages - ~t USER messages addressed to USER - ~U unread messages - ~v message is part of a collapsed thread. - ~V cryptographically verified messages - ~x EXPR messages which contain EXPR in the `References' field - ~y EXPR messages which contain EXPR in the `X-Label' field - ~z [MIN]-[MAX] messages with a size in the range MIN to MAX *) - ~= duplicated messages (see $duplicate_threads) + ~A all messages + ~b EXPR messages which contain EXPR in the message body + ~B EXPR messages which contain EXPR in the whole message + ~c USER messages carbon-copied to USER + ~C EXPR message is either to: or cc: EXPR + ~D deleted messages + ~d [MIN]-[MAX] messages with ``date-sent'' in a Date range + ~E expired messages + ~e EXPR message which contains EXPR in the ``Sender'' field + ~F flagged messages + ~f USER messages originating from USER + ~g cryptographically signed messages + ~G cryptographically encrypted messages + ~H EXPR messages with a spam attribute matching EXPR + ~h EXPR messages which contain EXPR in the message header + ~k message contains PGP key material + ~i ID message which match ID in the ``Message-ID'' field + ~L EXPR message is either originated or received by EXPR + ~l message is addressed to a known mailing list + ~m [MIN]-[MAX] message in the range MIN to MAX *) + ~n [MIN]-[MAX] messages with a score in the range MIN to MAX *) + ~N new messages + ~O old messages + ~p message is addressed to you (consults alternates) + ~P message is from you (consults alternates) + ~Q messages which have been replied to + ~R read messages + ~r [MIN]-[MAX] messages with ``date-received'' in a Date range + ~S superseded messages + ~s SUBJECT messages having SUBJECT in the ``Subject'' field. + ~T tagged messages + ~t USER messages addressed to USER + ~U unread messages + ~v message is part of a collapsed thread. + ~V cryptographically verified messages + ~x EXPR messages which contain EXPR in the `References' field + ~y EXPR messages which contain EXPR in the `X-Label' field + ~z [MIN]-[MAX] messages with a size in the range MIN to MAX *) + ~= duplicated messages (see $duplicate_threads) + ~$ unreferenced messages (requires threaded view) Where EXPR, USER, ID, and SUBJECT are ``regular expressions''. Special attention has to be made when using regular expressions inside @@ -2162,7 +2267,7 @@ *) The forms <[MAX], >[MIN], [MIN]- and -[MAX] are allowed, too. - 44..22..11.. PPaatttteerrnn MMooddiiffiieerr + 4.2.1. Pattern Modifier Note that patterns matching 'lists' of addresses (notably c,C,p,P and t) match if there is at least one match in the whole list. If you want @@ -2172,7 +2277,7 @@ ^~C \.de$ - 44..22..22.. CCoommpplleexx PPaatttteerrnnss + 4.2.2. Complex Patterns Logical AND is performed by specifying more than one criterion. For example: @@ -2180,7 +2285,7 @@ ~t mutt ~f elkins would select messages which contain the word ``mutt'' in the list of - recipients aanndd that have the word ``elkins'' in the ``From'' header + recipients and that have the word ``elkins'' in the ``From'' header field. Mutt also recognizes the following operators to create more complex @@ -2206,32 +2311,33 @@ '~s "^Junk +From +Me$" ~f ("Jim +Somebody"|"Ed +SomeoneElse")' Note that if a regular expression contains parenthesis, or a veritical - bar ("|"), you mmuusstt enclose the expression in double or single quotes + bar ("|"), you must enclose the expression in double or single quotes since those characters are also used to separate different parts of Mutt's pattern language. For example, ~f "me@(mutt\.org|cs\.hmc\.edu)" - Without the quotes, the parenthesis would truncate the regular - expression to simply _m_e_@, which is probably not what you want. + Without the quotes, the parenthesis wouldn't end. This would be + seperated to two OR'd patterns: ~f me@(mutt\.org and cs\.hmc\.edu). + They are never what you want. - 44..22..33.. SSeeaarrcchhiinngg bbyy DDaattee + 4.2.3. Searching by Date - Mutt supports two types of dates, _a_b_s_o_l_u_t_e and _r_e_l_a_t_i_v_e. + Mutt supports two types of dates, absolute and relative. - AAbbssoolluuttee. Dates mmuusstt be in DD/MM/YY format (month and year are + Absolute. Dates must be in DD/MM/YY format (month and year are optional, defaulting to the current month and year). An example of a valid range of dates is: Limit to messages matching: ~d 20/1/95-31/10 If you omit the minimum (first) date, and just specify ``-DD/MM/YY'', - all messages _b_e_f_o_r_e the given date will be selected. If you omit the - maximum (second) date, and specify ``DD/MM/YY-'', all messages _a_f_t_e_r + all messages before the given date will be selected. If you omit the + maximum (second) date, and specify ``DD/MM/YY-'', all messages after the given date will be selected. If you specify a single date with no dash (``-''), only messages sent on the given date will be selected. - EErrrroorr MMaarrggiinnss. You can add error margins to absolute dates. An error + Error Margins. You can add error margins to absolute dates. An error margin is a sign (+ or -), followed by a digit, followed by one of the following units: @@ -2248,16 +2354,16 @@ Limit to messages matching: ~d 15/1/2001*2w - RReellaattiivvee. This type of date is relative to the current date, and may + Relative. This type of date is relative to the current date, and may be specified as: - · >_o_f_f_s_e_t (messages older than _o_f_f_s_e_t units) + · >offset (messages older than offset units) - · <_o_f_f_s_e_t (messages newer than _o_f_f_s_e_t units) + · <offset (messages newer than offset units) - · =_o_f_f_s_e_t (messages exactly _o_f_f_s_e_t units old) + · =offset (messages exactly offset units old) - _o_f_f_s_e_t is specified as a positive number with one of the following + offset is specified as a positive number with one of the following units: y years @@ -2267,14 +2373,14 @@ Example: to select messages less than 1 month old, you would use - Limit to messages matching: ~d <1m + Limit to messages matching: ~d <1m - NNoottee:: all dates used when searching are relative to the llooccaall time + Note: all dates used when searching are relative to the local time zone, so unless you change the setting of your ``$index_format'' to - include a %[...] format, these are nnoott the dates shown in the main + include a %[...] format, these are not the dates shown in the main index. - 44..33.. UUssiinngg TTaaggss + 4.3. Using Tags Sometimes it is desirable to perform an operation on a group of messages all at once rather than one at a time. An example might be @@ -2287,19 +2393,25 @@ Once you have tagged the desired messages, you can use the ``tag- prefix'' operator, which is the ``;'' (semicolon) key by default. - When the ``tag-prefix'' operator is used, the nneexxtt operation will be + When the ``tag-prefix'' operator is used, the next operation will be applied to all tagged messages if that operation can be used in that manner. If the ``$auto_tag'' variable is set, the next operation applies to the tagged messages automatically, without requiring the ``tag-prefix''. - 44..44.. UUssiinngg HHooookkss + In ``macros'' or ``push'' commands, you can use the ``tag-prefix- + cond'' operator. If there are no tagged messages, mutt will "eat" the + rest of the macro to abort it's execution. Mutt will stop "eating" + the macro when it encounters the ``end-cond'' operator; after this + operator the rest of the macro will be executed as normal. + + 4.4. Using Hooks - A _h_o_o_k is a concept borrowed from the EMACS editor which allows you to + A hook is a concept borrowed from the EMACS editor which allows you to execute arbitrary commands before performing some operation. For example, you may wish to tailor your configuration based upon which mailbox you are reading, or to whom you are sending mail. In the Mutt - world, a _h_o_o_k consists of a ``regular expression'' or ``pattern'' + world, a hook consists of a ``regular expression'' or ``pattern'' along with a configuration option/command. See · ``folder-hook'' @@ -2316,9 +2428,9 @@ · ``fcc-save-hook'' - for specific details on each type of _h_o_o_k available. + for specific details on each type of hook available. - NNoottee:: if a hook changes configuration settings, these changes remain + Note: if a hook changes configuration settings, these changes remain effective until the end of the current mutt session. As this is generally not desired, a default hook needs to be added before all other hooks to restore configuration defaults. Here is an example with @@ -2327,7 +2439,7 @@ send-hook . 'unmy_hdr From:' send-hook ~Cb@b.b my_hdr from: c@c.c - 44..44..11.. MMeessssaaggee MMaattcchhiinngg iinn HHooookkss + 4.4.1. Message Matching in Hooks Hooks that act upon messages (send-hook, save-hook, fcc-hook, message- hook) are evaluated in a slightly different manner. For the other @@ -2337,7 +2449,7 @@ Mutt allows the use of the ``search pattern'' language for matching messages in hook commands. This works in exactly the same way as it - would when _l_i_m_i_t_i_n_g or _s_e_a_r_c_h_i_n_g the mailbox, except that you are + would when limiting or searching the mailbox, except that you are restricted to those operators which match information mutt extracts from the header of the message (i.e. from, to, cc, date, subject, etc.). @@ -2348,17 +2460,17 @@ send-hook '~t ^me@cs\.hmc\.edu$' 'my_hdr From: Mutt User ' which would execute the given command when sending mail to - _m_e_@_c_s_._h_m_c_._e_d_u. + me@cs.hmc.edu. However, it is not required that you write the pattern to match using - the full searching language. You can still specify a simple _r_e_g_u_l_a_r - _e_x_p_r_e_s_s_i_o_n like the other hooks, in which case Mutt will translate + the full searching language. You can still specify a simple regular + expression like the other hooks, in which case Mutt will translate your pattern into the full language, using the translation specified by the ``$default_hook'' variable. The pattern is translated at the time the hook is declared, so the value of ``$default_hook'' that is in effect at that time will be used. - 44..55.. EExxtteerrnnaall AAddddrreessss QQuueerriieess + 4.5. External Address Queries Mutt supports connecting to external directory databases such as LDAP, ph/qi, bbdb, or NIS through a wrapper script which connects to mutt @@ -2376,17 +2488,17 @@ An example multiple response output: - Searching database ... 20 entries ... 3 matching: - me@cs.hmc.edu Michael Elkins mutt dude - blong@fiction.net Brandon Long mutt and more - roessler@guug.de Thomas Roessler mutt pgp + Searching database ... 20 entries ... 3 matching: + me@cs.hmc.edu Michael Elkins mutt dude + blong@fiction.net Brandon Long mutt and more + roessler@guug.de Thomas Roessler mutt pgp There are two mechanisms for accessing the query function of mutt. One is to do a query from the index menu using the query function (default: Q). This will prompt for a query, then bring up the query menu which will list the matching responses. From the query menu, you can select addresses to create aliases, or to mail. You can tag - multiple messages to mail, start a new query, or have a new query + multiple addresses to mail, start a new query, or have a new query appended to the current responses. The other mechanism for accessing the query function is for address @@ -2399,7 +2511,7 @@ will activate the query menu. At the query menu, you can select one or more addresses to be added to the prompt. - 44..66.. MMaaiillbbooxx FFoorrmmaattss + 4.6. Mailbox Formats Mutt supports reading and writing of four different mailbox formats: mbox, MMDF, MH and Maildir. The mailbox type is autodetected, so @@ -2407,7 +2519,7 @@ creating new mailboxes, Mutt uses the default specified with the ``$mbox_type'' variable. - mmbbooxx. This is the most widely used mailbox format for UNIX. All + mbox. This is the most widely used mailbox format for UNIX. All messages are stored in a single file. Each message has a line of the form: @@ -2416,24 +2528,25 @@ to denote the start of a new message (this is often referred to as the ``From_'' line). - MMMMDDFF. This is a variant of the _m_b_o_x format. Each message is + MMDF. This is a variant of the mbox format. Each message is surrounded by lines containing ``^A^A^A^A'' (four control-A's). - MMHH. A radical departure from _m_b_o_x and _M_M_D_F, a mailbox consists of a + MH. A radical departure from mbox and MMDF, a mailbox consists of a directory and each message is stored in a separate file. The filename indicates the message number (however, this is may not correspond to the message number Mutt displays). Deleted messages are renamed with a - comma (,) prepended to the filename. NNoottee:: Mutt detects this type of + comma (,) prepended to the filename. Note: Mutt detects this type of mailbox by looking for either .mh_sequences or .xmhcache (needed to distinguish normal directories from MH mailboxes). - MMaaiillddiirr. The newest of the mailbox formats, used by the Qmail MTA (a - replacement for sendmail). Similar to _M_H, except that it adds three - subdirectories of the mailbox: _t_m_p, _n_e_w and _c_u_r. Filenames for the + Maildir. The newest of the mailbox formats, used by the Qmail MTA (a + replacement for sendmail). Similar to MH, except that it adds three + subdirectories of the mailbox: tmp, new and cur. Filenames for the messages are chosen in such a way they are unique, even when two programs are writing the mailbox over NFS, which means that no file locking is needed. - 44..77.. MMaaiillbbooxx SShhoorrttccuuttss + + 4.7. Mailbox Shortcuts There are a number of built in shortcuts which refer to specific mailboxes. These shortcuts can be used anywhere you are prompted for @@ -2451,10 +2564,10 @@ · = or + -- refers to your ``$folder'' directory - · @_a_l_i_a_s -- refers to the ``default save folder'' as determined by + · @alias -- refers to the ``default save folder'' as determined by the address of the alias - 44..88.. HHaannddlliinngg MMaaiilliinngg LLiissttss + 4.8. Handling Mailing Lists Mutt has a few configuration options that make dealing with large amounts of mail easier. The first thing you must do is to let Mutt @@ -2467,7 +2580,7 @@ Now that Mutt knows what your mailing lists are, it can do several things, the first of which is the ability to show the name of a list through which you received a message (i.e., of a subscribed list) in - the _i_n_d_e_x menu display. This is useful to distinguish between + the index menu display. This is useful to distinguish between personal and list mail in the same mailbox. In the ``$index_format'' variable, the escape ``%L'' will return the string ``To '' when ``list'' appears in the ``To'' field, and ``Cc '' when it @@ -2478,7 +2591,7 @@ to get quite large. Most people do not bother to remove the author of the message they are reply to from the list, resulting in two or more copies being sent to that person. The ``list-reply'' function, which - by default is bound to ``L'' in the _i_n_d_e_x menu and _p_a_g_e_r, helps reduce + by default is bound to ``L'' in the index menu and pager, helps reduce the clutter by only replying to the known mailing list addresses instead of all recipients (except as specified by Mail-Followup-To, see below). @@ -2520,7 +2633,7 @@ individually). The ``$index_format'' variable's ``%y'' and ``%Y'' escapes can be used to expand ``X-Label:'' fields in the index, and Mutt's pattern-matcher can match regular expressions to ``X-Label:'' - fields with the `` y'' selector. ``X-Label:'' is not a standard + fields with the ``y'' selector. ``X-Label:'' is not a standard message header field, but it can easily be inserted by procmail and other mail filtering agents. @@ -2532,7 +2645,7 @@ dealing with large volume mailing lists easier because you can easily delete uninteresting threads and quickly find topics of value. - 44..99.. DDeelliivveerryy SSttaattuuss NNoottiiffiiccaattiioonn ((DDSSNN)) SSuuppppoorrtt + 4.9. Delivery Status Notification (DSN) Support RFC1894 defines a set of MIME content types for relaying information about the status of electronic mail messages. These can be thought of @@ -2546,10 +2659,10 @@ message should be returned with the receipt (headers or full message). Refer to the man page on sendmail for more details on DSN. - 44..1100.. PPOOPP33 SSuuppppoorrtt ((OOPPTTIIOONNAALL)) + 4.10. POP3 Support (OPTIONAL) - If Mutt was compiled with POP3 support (by running the _c_o_n_f_i_g_u_r_e - script with the _-_-_e_n_a_b_l_e_-_p_o_p flag), it has the ability to work with + If Mutt was compiled with POP3 support (by running the configure + script with the --enable-pop flag), it has the ability to work with mailboxes located on a remote POP3 server and fetch mail for local browsing. @@ -2558,6 +2671,7 @@ You can select an alternative port by specifying it with the server, ie: pop://popserver:port/. + You can also specify different username for each folder, ie: pop://username@popserver[:port]/. @@ -2566,24 +2680,24 @@ can be controlled by the ``$pop_checkinterval'' variable, which defaults to every 60 seconds. - If Mutt was compiled with SSL support (by running the _c_o_n_f_i_g_u_r_e script - with the _-_-_w_i_t_h_-_s_s_l flag), connections to POP3 servers can be + If Mutt was compiled with SSL support (by running the configure script + with the --with-ssl flag), connections to POP3 servers can be encrypted. This naturally requires that the server supports SSL encrypted connections. To access a folder with POP3/SSL, you should use pops: prefix, ie: pops://[username@]popserver[:port]/. - Another way to access your POP3 mail is the _f_e_t_c_h_-_m_a_i_l function + Another way to access your POP3 mail is the fetch-mail function (default: G). It allows to connect to ``pop_host'', fetch all your new mail and place it in the local ``spoolfile''. After this point, Mutt runs exactly as if the mail had always been local. - NNoottee:: If you only need to fetch all messages to local mailbox you + Note: If you only need to fetch all messages to local mailbox you should consider using a specialized program, such as fetchmail - 44..1111.. IIMMAAPP SSuuppppoorrtt ((OOPPTTIIOONNAALL)) + 4.11. IMAP Support (OPTIONAL) - If Mutt was compiled with IMAP support (by running the _c_o_n_f_i_g_u_r_e - script with the _-_-_e_n_a_b_l_e_-_i_m_a_p flag), it has the ability to work with + If Mutt was compiled with IMAP support (by running the configure + script with the --enable-imap flag), it has the ability to work with folders located on a remote IMAP server. You can access the remote inbox by selecting the folder @@ -2599,8 +2713,8 @@ You can also specify different username for each folder, ie: imap://username@imapserver[:port]/INBOX. - If Mutt was compiled with SSL support (by running the _c_o_n_f_i_g_u_r_e script - with the _-_-_w_i_t_h_-_s_s_l flag), connections to IMAP servers can be + If Mutt was compiled with SSL support (by running the configure script + with the --with-ssl flag), connections to IMAP servers can be encrypted. This naturally requires that the server supports SSL encrypted connections. To access a folder with IMAP/SSL, you should use imaps://[username@]imapserver[:port]/path/to/folder as your folder @@ -2615,15 +2729,15 @@ When browsing folders on an IMAP server, you can toggle whether to look at only the folders you are subscribed to, or all folders with - the _t_o_g_g_l_e_-_s_u_b_s_c_r_i_b_e_d command. See also the ``$imap_list_subscribed'' + the toggle-subscribed command. See also the ``$imap_list_subscribed'' variable. Polling for new mail on an IMAP server can cause noticeable delays. So, you'll want to carefully tune the ``$mail_check'' and ``$timeout'' variables. Personally I use - set mail_check=90 - set timeout=15 + set mail_check=90 + set timeout=15 with relatively good results over my slow modem line. @@ -2631,7 +2745,7 @@ to v12.250, the server has been reported to disconnect a client if another client selects the same folder. - 44..1111..11.. TThhee FFoollddeerr BBrroowwsseerr + 4.11.1. The Folder Browser As of version 1.2, mutt supports browsing mailboxes on an IMAP server. This is mostly the same as the local file browser, with the following @@ -2652,7 +2766,7 @@ d by default. You may also subscribe and unsubscribe to mailboxes (normally these are bound to s and u, respectively). - 44..1111..22.. AAuutthheennttiiccaattiioonn + 4.11.2. Authentication Mutt supports four authentication methods with IMAP servers: SASL, GSSAPI, CRAM-MD5, and LOGIN (there is a patch by Grant Edwards to add @@ -2669,7 +2783,7 @@ entire session will be encrypted and invisible to those teeming network snoops. It is the best option if you have it. To use it, you must have the Cyrus SASL library installed on your system and compile - mutt with the _-_-_w_i_t_h_-_s_a_s_l flag. + mutt with the --with-sasl flag. Mutt will try whichever methods are compiled in and available on the server, in the following order: SASL, ANONYMOUS, GSSAPI, CRAM-MD5, @@ -2681,6 +2795,7 @@ authentication on the IMAP server, for all authenticators. This is overridden by an explicit username in the mailbox path (ie by using a mailbox name of the form {user@host}). + · ``$imap_pass'' - a password which you may preset, used by all authentication methods where a password is needed. @@ -2689,7 +2804,7 @@ If specified, this overrides mutt's default (attempt everything, in the order listed above). - 44..1122.. MMaannaaggiinngg mmuullttiippllee IIMMAAPP//PPOOPP aaccccoouunnttss ((OOPPTTIIOONNAALL)) + 4.12. Managing multiple IMAP/POP accounts (OPTIONAL) If you happen to have accounts on multiple IMAP and/or POP servers, you may find managing all the authentication settings inconvenient and @@ -2704,10 +2819,10 @@ account-hook imap://host1/ 'set imap_user=me1 imap_pass=foo' account-hook imap://host2/ 'set tunnel="ssh host2 /usr/libexec/imapd"' - 44..1133.. SSttaarrtt aa WWWWWW BBrroowwsseerr oonn UURRLLss ((EEXXTTEERRNNAALL)) + 4.13. Start a WWW Browser on URLs (EXTERNAL) - If a message contains URLs (_u_n_i_f_i_e_d _r_e_s_s_o_u_r_c_e _l_o_c_a_t_o_r = address in the - WWW space like _h_t_t_p_:_/_/_w_w_w_._m_u_t_t_._o_r_g_/), it is efficient to get a menu + If a message contains URLs (unified resource locator = address in the + WWW space like http://www.mutt.org/), it is efficient to get a menu with all the URLs and start a WWW browser on one of them. This functionality is provided by the external urlview program which can be retrieved at ftp://ftp.mutt.org/mutt/contrib/ and the configuration @@ -2716,7 +2831,7 @@ macro index \cb |urlview\n macro pager \cb |urlview\n - 55.. MMuutttt''ss MMIIMMEE SSuuppppoorrtt + 5. Mutt's MIME Support Quite a bit of effort has been made to make Mutt the premier text-mode MIME MUA. Every effort has been made to provide the functionality @@ -2727,13 +2842,13 @@ IANA MIME types. The other is the mailcap file, which specifies the external commands to use for handling specific MIME types. - 55..11.. UUssiinngg MMIIMMEE iinn MMuutttt + 5.1. Using MIME in Mutt There are three areas/menus in Mutt which deal with MIME, they are the pager (while viewing a message), the attachment menu and the compose menu. - 55..11..11.. VViieewwiinngg MMIIMMEE mmeessssaaggeess iinn tthhee ppaaggeerr + 5.1.1. Viewing MIME messages in the pager When you select a message from the index and view it in the pager, Mutt decodes the message to a text representation. Mutt internally @@ -2749,14 +2864,14 @@ [-- Type: text/plain, Encoding: 7bit, Size: 10000 --] Where the Description is the description or filename given for the - attachment, and the Encoding is one of 7bit/8bit/quoted-print­ + attachment, and the Encoding is one of 7bit/8bit/quoted-print- able/base64/binary. If Mutt cannot deal with a MIME type, it will display a message like: [-- image/gif is unsupported (use 'v' to view this part) --] - 55..11..22.. TThhee AAttttaacchhmmeenntt MMeennuu + 5.1.2. The Attachment Menu The default binding for view-attachments is `v', which displays the attachment menu for a message. The attachment menu displays a list of @@ -2775,7 +2890,7 @@ See the help on the attachment menu for more information. - 55..11..33.. TThhee CCoommppoossee MMeennuu + 5.1.3. The Compose Menu The compose menu is the menu you see before you send a message. It allows you to edit the recipient list, the subject, and other aspects @@ -2803,7 +2918,7 @@ description of the attachment, and can be changed with the edit- description command (default: d). - 55..22.. MMIIMMEE TTyyppee ccoonnffiigguurraattiioonn wwiitthh mmiimmee..ttyyppeess + 5.2. MIME Type configuration with mime.types When you add an attachment to your mail message, Mutt searches your personal mime.types file at ${HOME}/.mime.types, and then the system @@ -2836,7 +2951,7 @@ mime types should only be used if the recipient of the message is likely to be expecting such attachments. - 55..33.. MMIIMMEE VViieewweerr ccoonnffiigguurraattiioonn wwiitthh mmaaiillccaapp + 5.3. MIME Viewer configuration with mailcap Mutt supports RFC 1524 MIME Configuration, in particular the Unix specific format specified in Appendix A of RFC 1524. This file format @@ -2858,7 +2973,7 @@ usually as /usr/local/etc/mailcap, which contains some baseline entries. - 55..33..11.. TThhee BBaassiiccss ooff tthhee mmaaiillccaapp ffiillee + 5.3.1. The Basics of the mailcap file A mailcap file consists of a series of lines which are comments, blank, or definitions. @@ -2904,10 +3019,10 @@ text/html; lynx %s In this case, lynx does not support viewing a file from stdin, so you - must use the %s syntax. NNoottee:: _S_o_m_e _o_l_d_e_r _v_e_r_s_i_o_n_s _o_f _l_y_n_x _c_o_n_t_a_i_n _a - _b_u_g _w_h_e_r_e _t_h_e_y _w_i_l_l _c_h_e_c_k _t_h_e _m_a_i_l_c_a_p _f_i_l_e _f_o_r _a _v_i_e_w_e_r _f_o_r _t_e_x_t_/_h_t_m_l_. - _T_h_e_y _w_i_l_l _f_i_n_d _t_h_e _l_i_n_e _w_h_i_c_h _c_a_l_l_s _l_y_n_x_, _a_n_d _r_u_n _i_t_. _T_h_i_s _c_a_u_s_e_s - _l_y_n_x _t_o _c_o_n_t_i_n_u_o_u_s_l_y _s_p_a_w_n _i_t_s_e_l_f _t_o _v_i_e_w _t_h_e _o_b_j_e_c_t_. + must use the %s syntax. Note: Some older versions of lynx contain a + bug where they will check the mailcap file for a viewer for text/html. + They will find the line which calls lynx, and run it. This causes + lynx to continuously spawn itself to view the object. On the other hand, maybe you don't want to use lynx interactively, you just want to have it convert the text/html to text/plain, then you can @@ -2922,8 +3037,7 @@ text/*; more This is the simplest form of a mailcap file. - - 55..33..22.. SSeeccuurree uussee ooff mmaaiillccaapp + 5.3.2. Secure use of mailcap The interpretion of shell meta-characters embedded in MIME parameters can lead to security problems in general. Mutt tries to quote @@ -2936,7 +3050,7 @@ care of it. Therefore you should pay attention to the following rules: - _K_e_e_p _t_h_e _%_-_e_x_p_a_n_d_o_s _a_w_a_y _f_r_o_m _s_h_e_l_l _q_u_o_t_i_n_g_. Don't quote them with + Keep the %-expandos away from shell quoting. Don't quote them with single or double quotes. Mutt does this for you, the right way, as should any other program which interprets mailcap. Don't put them into backtick expansions. Be highly careful with eval statements, and @@ -2953,15 +3067,15 @@ text/test-mailcap-bug; cat %s; copiousoutput; test=charset=%{charset} \ && test "`echo $charset | tr '[A-Z]' '[a-z]'`" != iso-8859-1 - 55..33..33.. AAddvvaanncceedd mmaaiillccaapp UUssaaggee + 5.3.3. Advanced mailcap Usage - 55..33..33..11.. OOppttiioonnaall FFiieellddss + 5.3.3.1. Optional Fields In addition to the required content-type and view command fields, you can add semi-colon ';' separated fields to set flags and other options. Mutt recognizes the following optional fields: - ccooppiioouussoouuttppuutt + copiousoutput This flag tells Mutt that the command passes possibly large amounts of text on stdout. This causes Mutt to invoke a pager (either the internal pager or the external pager defined by the @@ -2975,22 +3089,22 @@ This will cause lynx to format the text/html output as text/plain and Mutt will use your standard pager to display the results. - nneeeeddsstteerrmmiinnaall + needsterminal Mutt uses this flag when viewing attachments with ``autoview'', in order to decide whether it should honor the setting of the ``$wait_key'' variable or not. When an attachment is viewed using an interactive program, and the corresponding mailcap - entry has a _n_e_e_d_s_t_e_r_m_i_n_a_l flag, Mutt will use ``$wait_key'' and + entry has a needsterminal flag, Mutt will use ``$wait_key'' and the exit status of the program to decide if it will ask you to press a key after the external program has exited. In all other situations it will not prompt you for a key. - ccoommppoossee==<> + compose= This flag specifies the command to use to create a new attachment of a specific MIME type. Mutt supports this from the compose menu. - ccoommppoosseettyyppeedd==<> + composetyped= This flag specifies the command to use to create a new attachment of a specific MIME type. This command differs from the compose command in that mutt will expect standard MIME @@ -2998,17 +3112,17 @@ filename, description, etc. for a new attachment. Mutt supports this from the compose menu. - pprriinntt==<> + print= This flag specifies the command to use to print a specific MIME type. Mutt supports this from the attachment and compose menus. - eeddiitt==<> + edit= This flag specifies the command to use to edit a specific MIME type. Mutt supports this from the compose menu, and also uses it to compose new attachments. Mutt will default to the defined editor for text attachments. - nnaammeetteemmppllaattee==<> + nametemplate=