From: Brendan Cully Date: Tue, 23 Jun 2009 07:20:51 +0000 (-0700) Subject: Update crypt-gpgme for mutt_mktemp change in [ed7eb5de7536] X-Git-Tag: neomutt-20160307~529 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48e5cdad025a13f1df0bba05dfcd5c532202563d;p=neomutt Update crypt-gpgme for mutt_mktemp change in [ed7eb5de7536] --- diff --git a/ChangeLog b/ChangeLog index f2b0657db..37d583e85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,19 @@ +2009-06-22 17:36 +0200 Rocco Rutte (54bc1ef602e7) + + * curs_lib.c: Make mutt_curses_(error|message) format message to COLS + chars. Closes #3278. + + While I'm at it, fold both functions into one. + +2009-06-22 17:21 +0200 Alexey Tourbin (e378bbdc3f0f) + + * smime_keys.pl: smime_keys: use Time::Local module. Closes #3277. + 2009-06-22 17:17 +0200 Rocco Rutte (4899f140ec25) * mbyte.c: Fix included iswupper(). Closes #3276. -2009-06-22 17:13 +0200 Rocco Rutte (bdf80e095fe5) - - * ChangeLog, lib.c: Catch range errors when converting to long. + * lib.c: Catch range errors when converting to long. 2009-06-21 21:57 +0200 Rocco Rutte (ed7eb5de7536) @@ -14,18 +23,12 @@ recvattach.c, recvcmd.c, rfc3676.c, send.c, sendlib.c, smime.c: Pass buffer size to mutt_mktemp() -2009-06-21 21:32 +0200 Rocco Rutte (7f0f11b1b6fa) - - * ChangeLog, handler.c, rfc3676.c: Port f=f and text/plain handlers to + * handler.c, rfc3676.c: Port f=f and text/plain handlers to mutt_read_line() -2009-06-21 21:04 +0200 Rocco Rutte (23fd0edaab41) - * lib.c: mutt_read_line(): make line counting ptr optional -2009-06-21 20:53 +0200 Rocco Rutte (9f1d56c0a247) - - * ChangeLog, sendlib.c: Silently drop headers not in "key: value" + * sendlib.c: Silently drop headers not in "key: value" format. Fixes out-of-memory exits. 2009-06-20 23:09 +0200 Rocco Rutte (6447ebe80797) @@ -33,10 +36,8 @@ * handler.c: f=f: Don't kill signature separator when stripping trailing spaces. Closes #3275. -2009-06-20 16:02 +0200 Rocco Rutte (cc1aa7702c96) - - * ChangeLog, curs_main.c: Disallow breaking threads for messages not - part of a thread + * curs_main.c: Disallow breaking threads for messages not part of + a thread 2009-06-20 15:22 +0200 Rocco Rutte (580ab0256c49) @@ -57,36 +58,24 @@ * mbox.c, mx.c, mx.h: Fixup atime for mbox/mmdf also when mailbox is unchanged but has new mail. See #1362. -2009-06-19 19:27 +0200 Rocco Rutte (bd59be56c6b0) - - * ChangeLog, mbox.c: Don't mangle atime/mtime for mbox folders without - new mail upon sync. Closes #1362, #3271. - -2009-06-19 19:23 +0200 Rocco Rutte (0fd362c870b8) + * mbox.c: Don't mangle atime/mtime for mbox folders without new + mail upon sync. Closes #1362, #3271. * doc/manual.xml.head: Manual: Add note and example for type conversions with my_vars -2009-06-19 18:49 +0200 Rocco Rutte (9656d94b83b2) - - * .hgignore: Ignore files from manual.pdf generation - -2009-06-19 18:46 +0200 Rocco Rutte (439274e8eca4) - * sendlib.c: Enforce 998 char length limit on header lines when sending. 2009-06-18 15:06 +0200 Antonio Radici (c6fe0bb8cf11) - * .hgignore, ChangeLog, doc/Makefile.am, doc/smime_keys.man: Provide + * doc/Makefile.am, doc/smime_keys.man: Provide smime_keys(1). Closes #3272. 2009-06-18 14:56 +0200 Rocco Rutte (508bfe4a2e23) * mbox.c: Backout experimental patch -2009-06-18 14:45 +0200 Rocco Rutte (aca707871bcf) - * UPDATING, mbox.c: UPDATING: add note about -a and -- 2009-06-17 16:19 -0700 Antonio Radici (25e46aad362b) diff --git a/crypt-gpgme.c b/crypt-gpgme.c index 29a575707..63ec2df63 100644 --- a/crypt-gpgme.c +++ b/crypt-gpgme.c @@ -403,7 +403,7 @@ static gpgme_data_t body_to_data_object (BODY *a, int convert) int err = 0; gpgme_data_t data; - mutt_mktemp (tempfile); + mutt_mktemp (tempfile, sizeof (tempfile)); fptmp = safe_fopen (tempfile, "w+"); if (!fptmp) { @@ -525,7 +525,7 @@ static char *data_object_to_tempfile (gpgme_data_t data, FILE **ret_fp) FILE *fp; size_t nread = 0; - mutt_mktemp (tempfile); + mutt_mktemp (tempfile, sizeof (tempfile)); fp = safe_fopen (tempfile, "w+"); if (!fp) { @@ -1711,7 +1711,7 @@ int pgp_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur) memset (&s, 0, sizeof (s)); s.fpin = fpin; - mutt_mktemp (tempfile); + mutt_mktemp (tempfile, sizeof (tempfile)); if (!(*fpout = safe_fopen (tempfile, "w+"))) { mutt_perror (tempfile); @@ -1756,7 +1756,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur) memset (&s, 0, sizeof (s)); s.fpin = fpin; fseeko (s.fpin, b->offset, 0); - mutt_mktemp (tempfile); + mutt_mktemp (tempfile, sizeof (tempfile)); if (!(tmpfp = safe_fopen (tempfile, "w+"))) { mutt_perror (tempfile); @@ -1774,7 +1774,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur) memset (&s, 0, sizeof (s)); s.fpin = tmpfp; s.fpout = 0; - mutt_mktemp (tempfile); + mutt_mktemp (tempfile, sizeof (tempfile)); if (!(*fpout = safe_fopen (tempfile, "w+"))) { mutt_perror (tempfile); @@ -1810,7 +1810,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur) memset (&s, 0, sizeof (s)); s.fpin = *fpout; fseeko (s.fpin, bb->offset, 0); - mutt_mktemp (tempfile); + mutt_mktemp (tempfile, sizeof (tempfile)); if (!(tmpfp = safe_fopen (tempfile, "w+"))) { mutt_perror (tempfile); @@ -1829,7 +1829,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin, FILE **fpout, BODY *b, BODY **cur) memset (&s, 0, sizeof (s)); s.fpin = tmpfp; s.fpout = 0; - mutt_mktemp (tempfile); + mutt_mktemp (tempfile, sizeof (tempfile)); if (!(*fpout = safe_fopen (tempfile, "w+"))) { mutt_perror (tempfile); @@ -1908,7 +1908,7 @@ static int pgp_gpgme_extract_keys (gpgme_data_t keydata, FILE** fp, int dryrun) goto err_tmpdir; } - mutt_mktemp (tmpfile); + mutt_mktemp (tmpfile, sizeof (tmpfile)); *fp = safe_fopen (tmpfile, "w+"); if (!*fp) { @@ -1985,7 +1985,7 @@ static int pgp_check_traditional_one_body (FILE *fp, BODY *b, int tagged_only) if (tagged_only && !b->tagged) return 0; - mutt_mktemp (tempfile); + mutt_mktemp (tempfile, sizeof (tempfile)); if (mutt_decode_save_attachment (fp, b, tempfile, 0, 0) != 0) { unlink (tempfile); @@ -2424,7 +2424,7 @@ int pgp_gpgme_encrypted_handler (BODY *a, STATE *s) /* Move forward to the application/pgp-encrypted body. */ a = a->next; - mutt_mktemp (tempfile); + mutt_mktemp (tempfile, sizeof (tempfile)); if (!(fpout = safe_fopen (tempfile, "w+"))) { if (s->flags & M_DISPLAY) @@ -2490,7 +2490,7 @@ int smime_gpgme_application_handler (BODY *a, STATE *s) dprint (2, (debugfile, "Entering smime_encrypted handler\n")); a->warnsig = 0; - mutt_mktemp (tempfile); + mutt_mktemp (tempfile, sizeof (tempfile)); if (!(fpout = safe_fopen (tempfile, "w+"))) { if (s->flags & M_DISPLAY) @@ -3450,7 +3450,7 @@ verify_key (crypt_key_t *key) gpgme_key_t k = NULL; int maxdepth = 100; - mutt_mktemp (tempfile); + mutt_mktemp (tempfile, sizeof (tempfile)); if (!(fp = safe_fopen (tempfile, "w"))) { mutt_perror _("Can't create temporary file");