X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgpkey.c;h=e5d1796d9580e52e89e09182e48a42ab2ac30a43;hp=a3b3ca24b3c23c848452c2559404d48940228c6a;hb=688ac22f746f785c27ac99ac86aa85a3035a3638;hpb=9ed7a487e3a922f2cbb222961c2c9710c3a65f91

diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c
index a3b3ca2..e5d1796 100644
--- a/lib-crypt/pgpkey.c
+++ b/lib-crypt/pgpkey.c
@@ -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;
@@ -406,7 +406,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;
@@ -466,15 +466,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);
-  strcat (helpstr, buf);        /* __STRCAT_CHECKED__ */
+  m_strcat(helpstr, sizeof(helpstr), buf);
   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);
-  strcat (helpstr, buf);        /* __STRCAT_CHECKED__ */
+  m_strcat(helpstr, sizeof(helpstr), buf);
   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;
@@ -500,13 +500,14 @@ static pgp_key_t pgp_select_key (pgp_key_t keys, address_t * p, const char *s)
 
     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;
       }
-      if ((fp = safe_fopen (tempfile, "w")) == NULL) {
+
+      fp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+      if (!fp) {
         m_fclose(&devnull);
         mutt_perror (_("Can't create temporary file"));
 
@@ -616,7 +617,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 ();
@@ -682,17 +683,18 @@ BODY *pgp_make_key_attachment (char *tempf)
   pgp_free_key (&key);
 
   if (!tempf) {
-    mutt_mktemp (tempfb);
+    tempfp = m_tempfile (tempfb, sizeof(tempfb), NONULL(Tempdir), NULL);
     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"));
-
     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"));
 
     m_fclose(&tempfp);