X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgpkey.c;h=96db58a5cb0993f7b33eba080a93f6fe2eab3146;hp=033c0e8bacba46292d0c03b91e29681ce34eb34c;hb=678c4d550b27a06ba3c94ac5821fcf0291c33f8a;hpb=f3cbb9f51357972f6e74244494236a41dc4d84cd

diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c
index 033c0e8..96db58a 100644
--- a/lib-crypt/pgpkey.c
+++ b/lib-crypt/pgpkey.c
@@ -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,
-               const char *ifstring, 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;
@@ -109,7 +109,7 @@ pgp_entry_fmt (char *dest, ssize_t destlen, char op,
   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);
@@ -125,7 +125,7 @@ pgp_entry_fmt (char *dest, ssize_t destlen, char op,
 
     {
       const char *cp;
-      char buf2[SHORT_STRING], *p;
+      char buf2[STRING], *p;
       int do_locales;
       struct tm *tm;
       ssize_t len;
@@ -235,11 +235,10 @@ pgp_entry_fmt (char *dest, ssize_t destlen, char op,
     *dest = '\0';
   }
 
-  if (optional)
-    mutt_FormatString (dest, destlen, ifstring, mutt_attach_fmt, data, 0);
-  else if (flags & M_FORMAT_OPTIONAL)
-    mutt_FormatString (dest, destlen, elsestring, mutt_attach_fmt, data, 0);
-  return (src);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+                mutt_attach_fmt, data, 0);
+  return src;
 }
 
 static void pgp_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
@@ -250,8 +249,8 @@ static void pgp_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
   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, COLS - SW, PgpEntryFormat, pgp_entry_fmt, &entry,
+              option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
 static int _pgp_compare_address (const void *a, const void *b)
@@ -406,7 +405,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;
-  char helpstr[SHORT_STRING], 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;
@@ -506,7 +505,7 @@ static pgp_key_t pgp_select_key (pgp_key_t keys, address_t * p, const char *s)
         break;
       }
 
-      fp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+      fp = m_tempfile (tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
       if (!fp) {
         m_fclose(&devnull);
         mutt_perror (_("Can't create temporary file"));
@@ -617,7 +616,7 @@ pgp_key_t pgp_ask_for_key (char *tag, char *whatfor,
                            short abilities, pgp_ring_t keyring)
 {
   pgp_key_t key;
-  char resp[SHORT_STRING];
+  char resp[STRING];
   struct pgp_cache *l = NULL;
 
   mutt_clear_error ();
@@ -683,7 +682,7 @@ BODY *pgp_make_key_attachment (char *tempf)
   pgp_free_key (&key);
 
   if (!tempf) {
-    tempfp = m_tempfile (tempfb, sizeof(tempfb), NONULL(Tempdir), NULL);
+    tempfp = m_tempfile (tempfb, sizeof(tempfb), NONULL(MCore.tmpdir), NULL);
     tempf = tempfb;
   } else {
     tempfp = safe_fopen(tempf, "a");