projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
workarounds, I do not understand why it segfault, it should *NOT*
[apps/madmutt.git]
/
lib-crypt
/
crypt-gpgme.c
diff --git
a/lib-crypt/crypt-gpgme.c
b/lib-crypt/crypt-gpgme.c
index
7e3495b
..
e295042
100644
(file)
--- a/
lib-crypt/crypt-gpgme.c
+++ b/
lib-crypt/crypt-gpgme.c
@@
-2150,7
+2150,7
@@
crypt_entry_fmt (char *dest, ssize_t destlen, char op,
case '[':
{
const char *cp;
case '[':
{
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;
@@
-2701,7
+2701,7
@@
static void print_key_info (gpgme_key_t key, FILE * fp)
const char *s = NULL, *s2 = NULL;
time_t tt = 0;
struct tm *tm;
const char *s = NULL, *s2 = NULL;
time_t tt = 0;
struct tm *tm;
- char shortbuf[S
HORT_S
TRING];
+ char shortbuf[STRING];
unsigned long aval = 0;
const char *delim;
int is_pgp = 0;
unsigned long aval = 0;
const char *delim;
int is_pgp = 0;
@@
-3203,7
+3203,7
@@
static crypt_key_t *crypt_select_key (crypt_key_t * keys,
crypt_key_t **key_table;
MUTTMENU *menu;
int i, done = 0;
crypt_key_t **key_table;
MUTTMENU *menu;
int i, done = 0;
- char helpstr[S
HORT_S
TRING], buf[LONG_STRING];
+ char helpstr[STRING], buf[LONG_STRING];
crypt_key_t *k;
int (*f) (const void *, const void *);
int menu_to_use = 0;
crypt_key_t *k;
int (*f) (const void *, const void *);
int menu_to_use = 0;
@@
-3563,7
+3563,7
@@
static crypt_key_t *crypt_ask_for_key (char *tag,
unsigned int app, int *forced_valid)
{
crypt_key_t *key;
unsigned int app, int *forced_valid)
{
crypt_key_t *key;
- char resp[S
HORT_S
TRING];
+ char resp[STRING];
struct crypt_cache *l = NULL;
int dummy;
struct crypt_cache *l = NULL;
int dummy;
@@
-3649,9
+3649,7
@@
static char *find_keys (address_t * to, address_t * cc, address_t * bcc,
last = &((*last)->next);
}
last = &((*last)->next);
}
- if (fqdn)
- rfc822_qualify (tmp, fqdn);
-
+ rfc822_qualify(tmp, fqdn);
address_list_uniq(tmp);
for (p = tmp; p; p = p->next) {
address_list_uniq(tmp);
for (p = tmp; p; p = p->next) {
@@
-3670,8
+3668,7
@@
static char *find_keys (address_t * to, address_t * cc, address_t * bcc,
/* check for e-mail address */
if ((t = strchr (keyID, '@')) &&
(addr = rfc822_parse_adrlist (NULL, keyID))) {
/* check for e-mail address */
if ((t = strchr (keyID, '@')) &&
(addr = rfc822_parse_adrlist (NULL, keyID))) {
- if (fqdn)
- rfc822_qualify (addr, fqdn);
+ rfc822_qualify(addr, fqdn);
q = addr;
}
else {
q = addr;
}
else {
@@
-3758,7
+3755,7
@@
void smime_gpgme_init (void)
static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime)
{
crypt_key_t *p;
static int gpgme_send_menu (HEADER * msg, int *redraw, int is_smime)
{
crypt_key_t *p;
- char input_signas[S
HORT_S
TRING];
+ char input_signas[STRING];
int choice;
if (msg->security & APPLICATION_PGP)
int choice;
if (msg->security & APPLICATION_PGP)