projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
optimizations, remove horrors.
[apps/madmutt.git]
/
lib-crypt
/
pgpkey.c
diff --git
a/lib-crypt/pgpkey.c
b/lib-crypt/pgpkey.c
index
ddb8f1c
..
b1ded7c
100644
(file)
--- a/
lib-crypt/pgpkey.c
+++ b/
lib-crypt/pgpkey.c
@@
-11,12
+11,12
@@
#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
#include <lib-lib/lib-lib.h>
#include <lib-mime/mime.h>
+#include <lib-sys/unix.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
-#include "mutt.h"
#include "recvattach.h"
#include "pgp.h"
#include "pager.h"
#include "recvattach.h"
#include "pgp.h"
#include "pager.h"
@@
-99,8
+99,8
@@
typedef struct pgp_entry {
static const char *
pgp_entry_fmt (char *dest, ssize_t destlen, char op,
const char *src, const char *prefix,
static const char *
pgp_entry_fmt (char *dest, ssize_t destlen, char op,
const char *src, const char *prefix,
- const char *ifstr
ing, const char *elsestring
,
-
unsigned long
data, format_flag flags)
+ const char *ifstr
, const char *elstr
,
+
anytype
data, format_flag flags)
{
char fmt[16];
pgp_entry_t *entry;
{
char fmt[16];
pgp_entry_t *entry;
@@
-109,7
+109,7
@@
pgp_entry_fmt (char *dest, ssize_t destlen, char op,
int kflags = 0;
int optional = (flags & M_FORMAT_OPTIONAL);
int kflags = 0;
int optional = (flags & M_FORMAT_OPTIONAL);
- entry =
(pgp_entry_t *) data
;
+ entry =
data.ptr
;
uid = entry->uid;
key = uid->parent;
pkey = pgp_principal_key (key);
uid = entry->uid;
key = uid->parent;
pkey = pgp_principal_key (key);
@@
-125,7
+125,7
@@
pgp_entry_fmt (char *dest, ssize_t destlen, char op,
{
const char *cp;
{
const char *cp;
- char buf2[S
HORT_S
TRING], *p;
+ char buf2[STRING], *p;
int do_locales;
struct tm *tm;
ssize_t len;
int do_locales;
struct tm *tm;
ssize_t len;
@@
-236,9
+236,9
@@
pgp_entry_fmt (char *dest, ssize_t destlen, char op,
}
if (optional)
}
if (optional)
- m
utt_FormatString (dest, destlen, ifstring
, mutt_attach_fmt, data, 0);
+ m
_strformat (dest, destlen, ifstr
, mutt_attach_fmt, data, 0);
else if (flags & M_FORMAT_OPTIONAL)
else if (flags & M_FORMAT_OPTIONAL)
- m
utt_FormatString (dest, destlen, elsestring
, mutt_attach_fmt, data, 0);
+ m
_strformat (dest, destlen, elstr
, mutt_attach_fmt, data, 0);
return (src);
}
return (src);
}
@@
-250,8
+250,9
@@
static void pgp_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
entry.uid = KeyTable[num];
entry.num = num + 1;
entry.uid = KeyTable[num];
entry.num = num + 1;
- mutt_FormatString (s, l, NONULL (PgpEntryFormat), pgp_entry_fmt,
- (unsigned long) &entry, M_FORMAT_ARROWCURSOR);
+ m_strformat(s, l, NONULL (PgpEntryFormat), pgp_entry_fmt,
+ (void*)&entry,
+ option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
}
static int _pgp_compare_address (const void *a, const void *b)
}
static int _pgp_compare_address (const void *a, const void *b)
@@
-406,7
+407,7
@@
static pgp_key_t pgp_select_key (pgp_key_t keys, address_t * p, const char *s)
pgp_uid_t **KeyTable;
MUTTMENU *menu;
int i, done = 0;
pgp_uid_t **KeyTable;
MUTTMENU *menu;
int i, done = 0;
- char helpstr[S
HORT_S
TRING], buf[LONG_STRING], tmpbuf[STRING];
+ char helpstr[STRING], buf[LONG_STRING], tmpbuf[STRING];
char cmd[LONG_STRING], tempfile[_POSIX_PATH_MAX];
FILE *fp, *devnull;
pid_t thepid;
char cmd[LONG_STRING], tempfile[_POSIX_PATH_MAX];
FILE *fp, *devnull;
pid_t thepid;
@@
-466,15
+467,15
@@
static pgp_key_t pgp_select_key (pgp_key_t keys, address_t * p, const char *s)
helpstr[0] = 0;
mutt_make_help (buf, sizeof (buf), _("Exit "), MENU_PGP, OP_EXIT);
helpstr[0] = 0;
mutt_make_help (buf, sizeof (buf), _("Exit "), MENU_PGP, OP_EXIT);
- strcat (helpstr, buf); /* __STRCAT_CHECKED__ */
+ m_strcat(helpstr, sizeof(helpstr), buf);
mutt_make_help (buf, sizeof (buf), _("Select "), MENU_PGP,
OP_GENERIC_SELECT_ENTRY);
mutt_make_help (buf, sizeof (buf), _("Select "), MENU_PGP,
OP_GENERIC_SELECT_ENTRY);
- strcat (helpstr, buf); /* __STRCAT_CHECKED__ */
+ m_strcat(helpstr, sizeof(helpstr), buf);
mutt_make_help (buf, sizeof (buf), _("Check key "), MENU_PGP,
OP_VERIFY_KEY);
mutt_make_help (buf, sizeof (buf), _("Check key "), MENU_PGP,
OP_VERIFY_KEY);
- strcat (helpstr, buf); /* __STRCAT_CHECKED__ */
+ m_strcat(helpstr, sizeof(helpstr), buf);
mutt_make_help (buf, sizeof (buf), _("Help"), MENU_PGP, OP_HELP);
mutt_make_help (buf, sizeof (buf), _("Help"), MENU_PGP, OP_HELP);
- strcat (helpstr, buf); /* __STRCAT_CHECKED__ */
+ m_strcat(helpstr, sizeof(helpstr), buf);
menu = mutt_new_menu ();
menu->max = i;
menu = mutt_new_menu ();
menu->max = i;
@@
-500,14
+501,15
@@
static pgp_key_t pgp_select_key (pgp_key_t keys, address_t * p, const char *s)
case OP_VERIFY_KEY:
case OP_VERIFY_KEY:
- mutt_mktemp (tempfile);
- if ((devnull = fopen ("/dev/null", "w")) == NULL) { /* __FOPEN_CHECKED__ */
+ if ((devnull = fopen("/dev/null", "w")) == NULL) {
mutt_perror (_("Can't open /dev/null"));
break;
}
mutt_perror (_("Can't open /dev/null"));
break;
}
- if ((fp = safe_fopen (tempfile, "w")) == NULL) {
- fclose (devnull);
+
+ fp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ if (!fp) {
+ m_fclose(&devnull);
mutt_perror (_("Can't create temporary file"));
break;
mutt_perror (_("Can't create temporary file"));
break;
@@
-525,13
+527,13
@@
static pgp_key_t pgp_select_key (pgp_key_t keys, address_t * p, const char *s)
mutt_perror (_("Can't create filter"));
unlink (tempfile);
mutt_perror (_("Can't create filter"));
unlink (tempfile);
-
fclose (
fp);
-
fclose (
devnull);
+
m_fclose(&
fp);
+
m_fclose(&
devnull);
}
mutt_wait_filter (thepid);
}
mutt_wait_filter (thepid);
-
fclose (
fp);
-
fclose (
devnull);
+
m_fclose(&
fp);
+
m_fclose(&
devnull);
mutt_clear_error ();
snprintf (cmd, sizeof (cmd), _("Key ID: 0x%s"),
pgp_keyid (pgp_principal_key
mutt_clear_error ();
snprintf (cmd, sizeof (cmd), _("Key ID: 0x%s"),
pgp_keyid (pgp_principal_key
@@
-616,7
+618,7
@@
pgp_key_t pgp_ask_for_key (char *tag, char *whatfor,
short abilities, pgp_ring_t keyring)
{
pgp_key_t key;
short abilities, pgp_ring_t keyring)
{
pgp_key_t key;
- char resp[S
HORT_S
TRING];
+ char resp[STRING];
struct pgp_cache *l = NULL;
mutt_clear_error ();
struct pgp_cache *l = NULL;
mutt_clear_error ();
@@
-682,20
+684,21
@@
BODY *pgp_make_key_attachment (char *tempf)
pgp_free_key (&key);
if (!tempf) {
pgp_free_key (&key);
if (!tempf) {
-
mutt_mktemp (tempfb
);
+
tempfp = m_tempfile (tempfb, sizeof(tempfb), NONULL(Tempdir), NULL
);
tempf = tempfb;
tempf = tempfb;
+ } else {
+ tempfp = safe_fopen(tempf, "a");
}
}
- if (
(tempfp = safe_fopen (tempf, tempf == tempfb ? "w" : "a")) == NULL
) {
+ if (
!tempfp
) {
mutt_perror (_("Can't create temporary file"));
mutt_perror (_("Can't create temporary file"));
-
return NULL;
}
return NULL;
}
- if ((devnull = fopen
("/dev/null", "w")) == NULL) { /* __FOPEN_CHECKED__ */
+ if ((devnull = fopen
("/dev/null", "w")) == NULL) {
mutt_perror (_("Can't open /dev/null"));
mutt_perror (_("Can't open /dev/null"));
-
fclose (
tempfp);
+
m_fclose(&
tempfp);
if (tempf == tempfb)
unlink (tempf);
return NULL;
if (tempf == tempfb)
unlink (tempf);
return NULL;
@@
-710,15
+713,15
@@
BODY *pgp_make_key_attachment (char *tempf)
mutt_perror (_("Can't create filter"));
unlink (tempf);
mutt_perror (_("Can't create filter"));
unlink (tempf);
-
fclose (
tempfp);
-
fclose (
devnull);
+
m_fclose(&
tempfp);
+
m_fclose(&
devnull);
return NULL;
}
mutt_wait_filter (thepid);
return NULL;
}
mutt_wait_filter (thepid);
-
fclose (
tempfp);
-
fclose (
devnull);
+
m_fclose(&
tempfp);
+
m_fclose(&
devnull);
att = body_new();
att->filename = m_strdup(tempf);
att = body_new();
att->filename = m_strdup(tempf);
@@
-876,7
+879,7
@@
pgp_key_t pgp_getkeybyaddr (address_t * a, short abilities, pgp_ring_t keyring)
return NULL;
}
return NULL;
}
-pgp_key_t pgp_getkeybystr (char *p, short abilities, pgp_ring_t keyring)
+pgp_key_t pgp_getkeybystr (c
onst c
har *p, short abilities, pgp_ring_t keyring)
{
string_list_t *hints = NULL;
pgp_key_t keys;
{
string_list_t *hints = NULL;
pgp_key_t keys;