Richard Russon [Sat, 20 Jan 2018 16:52:14 +0000 (16:52 +0000)]
merge: RFC2047 improvements
* Handle RFC2047 words split in the middle of a multibyte character
* move rfc2047 functions to library
* Use our base64 API instead of duplicating the decoding algorithm
* Move mutt_rfc2047_choose_charset to mutt_ch_choose
* light tidy
Fixes an bug introduced by changes intorduced in commit 465fad6d21ac3b9d2ae5d12bae7705f5f04323e7 to contrib/gpg.rc that breaks signed
and encrypted mail. The issues is just a typo related to way that pgpewrap
works. This should fix issue #998.
Richard Russon [Tue, 16 Jan 2018 23:59:16 +0000 (23:59 +0000)]
merge: upstream fixes (mutt/default)
* Fix improper signed int conversion of IMAP uid and msn values.
* Change imap literal counts to parse and store unsigned ints.
* Fix imap status count range check.
* cmd_handle_fatal: make error message a bit more descriptive
* Updated French translation.
* Create pgp and s/mime default and sign_as key vars. (see #3983)
* Add missing setup calls when resuming encrypted drafts.
* mutt_pretty_size: show real number for small files
* examine_directory: set directory/symlink size to zero
* Update pl.po
* Fixed GPGME translations that weren’t shown but affected the keyboard
* docs: update encrypt-to-self
* Update smime.rc: Typo fix, consistent headings
* Add pgp_default_key and smime_sign_as info to contrib rc files.
* Split Copyright and Thanks in help output.
* strip out copyright translations
Olaf Hering [Tue, 16 Jan 2018 08:40:06 +0000 (09:40 +0100)]
Split Copyright and Thanks in help output.
The Copyright string is changing often, and its content is obvious.
It does not need translation. The remaining string can be translated.
This change avoids a stale translation once one of the years change.
Olaf Hering [Tue, 3 Dec 2013 15:42:39 +0000 (16:42 +0100)]
examine_directory: set directory/symlink size to zero
The size of a directory or symlink in the folder browser is not meaningful.
For directories it means just how many blocks were allocated to hold all
entries. It does not mean that the entries are still present in the directory.
For symlinks its the size of the target.
Set both to zero to simplify the folder browser output.
Kevin McCarthy [Thu, 11 Jan 2018 21:24:30 +0000 (13:24 -0800)]
Create pgp and s/mime default and sign_as key vars. (see #3983)
The $postpone_encrypt and $(pgp/smime)_self_encrypt configuration
variables have created a somewhat messier situation for users. Many
of them now have to specify their keys across multiple configuration
variables.
(Trac) Ticket #3983 had a reasonable request: "if my encrypt and
signing keys are the same, why can't I just specify my key once in my
.muttrc?"
The problem currently is that $smime_default_key and $pgp_sign_as are
both used to specify signing keys, and are set by the "sign (a)s"
security menu choice. So we can't store encryption keys there because
some users have separate sign-only capability keys.
Create $pgp_default_key to store the default encryption key. Change
signing to use $pgp_default_key, unless overridden by $pgp_sign_as.
The pgp "sign (a)s" will continue setting $pgp_sign_as.
Create $smime_sign_as. Change signing to use $smime_default_key
unless overridden by $smime_sign_as. Change s/mime "sign (a)s" menu
to set $smime_sign_as instead.
Change $postpone_encrypt and $(pgp/smime)_self_encrypt to use
$(pgp/smime)_default_key by default.
Mark $(pgp/smime)_self_encrypt_as deprecated. They are now aliases
for the $(pgp/smime)_default_key config vars.
Change $(pgp/smime)_self_encrypt default to set.
The intent is that most users now need only set
$(pgp/smime)_default_key. If they have a sign-only key, or have
separate signing and encryption keys, they can put that in
$(pgp/smime)_sign_as. This also enables to default self_encrypt on
and solve a very common request.
Thanks to Michele Marcionelli and Vincent Lefèvre for gently pushing
me towards a solution.
Fabian Groffen [Sun, 7 Jan 2018 12:06:56 +0000 (13:06 +0100)]
cmd_handle_fatal: make error message a bit more descriptive
When there are multiple IMAP connections available, "Mailbox closed"
doesn't give a hint as to which one. Use account info to identify which
mailbox was closed.
Kevin McCarthy [Sat, 6 Jan 2018 23:55:17 +0000 (15:55 -0800)]
Change imap literal counts to parse and store unsigned ints.
IMAP literals are of type number. Change imap_get_literal_count() to
use mutt_atoui() instead of atoi(). Change the return type variables
used to store the count to type unsigned int.
It's doubtful this was a real issue, but as long as we're cleaning up
incorrect atoi() usage, we should fix this too.
Kevin McCarthy [Sat, 6 Jan 2018 04:39:50 +0000 (20:39 -0800)]
Fix improper signed int conversion of IMAP uid and msn values.
Several places in the imap code, when parsing "number" and "nz-number"
values from the IMAP data, use atoi() and strtol(). This is
incorrect, and can result in failures when a uid value happens to be
larger than 2^31.
Create a helper function, mutt_atoui() and use that instead. One
place was using strtol() and relying on the endptr parameter, and so
was changed to use strtoul() instead.
Thanks to Paul Saunders for the bug report and original patch, which
this commit is based on.
Kevin McCarthy [Sun, 31 Dec 2017 03:10:16 +0000 (19:10 -0800)]
Disable message security if the backend is not available.
Gitlab issue #3 exposed an awkward corner case: if mutt is configured
without PGP or S/MIME, and with GPGME, but $crypt_use_gpgme is unset.
In this case, no backend will be available, but WithCrypto will be set
with both APPLICATION_PGP and APPLICATION_SMIME bits.
That will allow various config vars to enable encryption or signing,
even though there will be no backend available to perform them. The
message security flag might then be set, but when the user hits send,
will end up back at the compose menu due to the error.
The pgp or smime menu might not even be available to clear the
security setting!
Add a check in send.c before the compose menu is invoked, and give a
warning message for the menu ops inside the compose menu.
I believe this should prevent the issue. However this is a corner
case combined with user misconfiguration, so I don't believe is worth
a large effort to completely eradicate.
Richard Russon [Thu, 28 Dec 2017 20:19:38 +0000 (20:19 +0000)]
merge: Prepare the code for the new config system
* regex obj to ptr
* refactor the hash types
* expand global bools,quadoptions
* Rename all the config bools OPT_ABC_XYZ -> AbcXyz
* Adjust the members of struct Options
* group the synonyms at the end of the list
* move all config variables to the end of the file
Aleksa Sarai [Sun, 17 Dec 2017 13:39:08 +0000 (00:39 +1100)]
nested-if: correctly handle "<" and ">" with %?
As part of the implementation of nested-if[1], we translate old-style
conditional expandos into nested-if expandos. However, this translation
did not account for the metacharacters that need to be escaped in
nested-if expandos that are valid in old-style expandos (in particular
"<" and ">"). Correct this by escaping the relevant metacharacters.
With this patch, it is now possible to do something like
:set status_format=" %rMail%r >%?u? +%u >?"
Without causing an ">" to be included if %u is 0 (which used to be the
case).