remove some mutt_mktemp

[apps/madmutt.git] / lib-crypt / crypt.c

diff --git a/lib-crypt/crypt.c b/lib-crypt/crypt.c
index eb60a2d..b133add 100644 (file)
--- a/lib-crypt/crypt.c
+++ b/lib-crypt/crypt.c
@@ -12,39 +12,20 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <sys/wait.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
+#include <lib-lib/lib-lib.h>
 
 #ifdef HAVE_LOCALE_H
 #  include <locale.h>
 #endif
-#ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #  include <sys/resource.h>
 #endif
 
-#include <lib-lib/str.h>
-#include <lib-lib/file.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/macros.h>
-
 #include <lib-mime/mime.h>
 
 #include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
 
-#include "mutt.h"
 #include "alias.h"
 #include "handler.h"
 #include "copy.h"
@@ -232,162 +213,6 @@ int mutt_protect (HEADER * msg, char *keylist)
 }
 
 
-
-
-int mutt_is_multipart_signed (BODY * b)
-{
-  char *p;
-
-  if (!b || !(b->type == TYPEMULTIPART) ||
-      !b->subtype || ascii_strcasecmp (b->subtype, "signed"))
-    return 0;
-
-  if (!(p = parameter_getval(b->parameter, "protocol")))
-    return 0;
-
-  if (!(ascii_strcasecmp (p, "multipart/mixed")))
-    return SIGN;
-
-  if (!(ascii_strcasecmp (p, "application/pgp-signature")))
-    return PGPSIGN;
-
-  if (!(ascii_strcasecmp (p, "application/x-pkcs7-signature")))
-    return SMIMESIGN;
-  if (!(ascii_strcasecmp (p, "application/pkcs7-signature")))
-    return SMIMESIGN;
-
-  return 0;
-}
-
-
-int mutt_is_multipart_encrypted (BODY * b)
-{
-  char *p;
-
-  if (!b || b->type != TYPEMULTIPART ||
-      !b->subtype || ascii_strcasecmp (b->subtype, "encrypted") ||
-      !(p = parameter_getval(b->parameter, "protocol")) ||
-      ascii_strcasecmp (p, "application/pgp-encrypted"))
-    return 0;
-
-  return PGPENCRYPT;
-}
-
-
-int mutt_is_application_pgp (BODY * m)
-{
-  int t = 0;
-  char *p;
-
-  if (m->type == TYPEAPPLICATION) {
-    if (!ascii_strcasecmp (m->subtype, "pgp")
-        || !ascii_strcasecmp (m->subtype, "x-pgp-message")) {
-      if ((p = parameter_getval(m->parameter, "x-action"))
-          && (!ascii_strcasecmp (p, "sign")
-              || !ascii_strcasecmp (p, "signclear")))
-        t |= PGPSIGN;
-
-      if ((p = parameter_getval(m->parameter, "format")) &&
-          !ascii_strcasecmp (p, "keys-only"))
-        t |= PGPKEY;
-
-      if (!t)
-        t |= PGPENCRYPT;        /* not necessarily correct, but... */
-    }
-
-    if (!ascii_strcasecmp (m->subtype, "pgp-signed"))
-      t |= PGPSIGN;
-
-    if (!ascii_strcasecmp (m->subtype, "pgp-keys"))
-      t |= PGPKEY;
-  }
-  else if (m->type == TYPETEXT && ascii_strcasecmp ("plain", m->subtype) == 0) {
-    if (((p = parameter_getval(m->parameter, "x-mutt-action"))
-         || (p = parameter_getval(m->parameter, "x-action"))
-         || (p = parameter_getval(m->parameter, "action")))
-        && !ascii_strncasecmp ("pgp-sign", p, 8))
-      t |= PGPSIGN;
-    else if (p && !ascii_strncasecmp ("pgp-encrypt", p, 11))
-      t |= PGPENCRYPT;
-    else if (p && !ascii_strncasecmp ("pgp-keys", p, 7))
-      t |= PGPKEY;
-  }
-  if (t)
-    t |= PGPINLINE;
-
-  return t;
-}
-
-int mutt_is_application_smime (BODY * m)
-{
-  char *t = NULL;
-  int len, complain = 0;
-
-  if (!m)
-    return 0;
-
-  if ((m->type & TYPEAPPLICATION) && m->subtype) {
-    /* S/MIME MIME types don't need x- anymore, see RFC2311 */
-    if (!ascii_strcasecmp (m->subtype, "x-pkcs7-mime") ||
-        !ascii_strcasecmp (m->subtype, "pkcs7-mime")) {
-      if ((t = parameter_getval(m->parameter, "smime-type"))) {
-        if (!ascii_strcasecmp (t, "enveloped-data"))
-          return SMIMEENCRYPT;
-        else if (!ascii_strcasecmp (t, "signed-data"))
-          return (SMIMESIGN | SMIMEOPAQUE);
-        else
-          return 0;
-      }
-      /* Netscape 4.7 uses 
-       * Content-Description: S/MIME Encrypted Message
-       * instead of Content-Type parameter
-       */
-      if (!ascii_strcasecmp (m->description, "S/MIME Encrypted Message"))
-        return SMIMEENCRYPT;
-      complain = 1;
-    }
-    else if (ascii_strcasecmp (m->subtype, "octet-stream"))
-      return 0;
-
-    t = parameter_getval(m->parameter, "name");
-
-    if (!t)
-      t = m->d_filename;
-    if (!t)
-      t = m->filename;
-    if (!t) {
-      if (complain)
-        mutt_message (_
-                      ("S/MIME messages with no hints on content are unsupported."));
-      return 0;
-    }
-
-    /* no .p7c, .p10 support yet. */
-
-    len = m_strlen(t) - 4;
-    if (len > 0 && *(t + len) == '.') {
-      len++;
-      if (!ascii_strcasecmp ((t + len), "p7m"))
-#if 0
-        return SMIMEENCRYPT;
-#else
-        /* Not sure if this is the correct thing to do, but 
-           it's required for compatibility with Outlook */
-        return (SMIMESIGN | SMIMEOPAQUE);
-#endif
-      else if (!ascii_strcasecmp ((t + len), "p7s"))
-        return (SMIMESIGN | SMIMEOPAQUE);
-    }
-  }
-
-  return 0;
-}
-
-
-
-
-
-
 int crypt_query (BODY * m)
 {
   int t = 0;
@@ -440,8 +265,6 @@ int crypt_query (BODY * m)
 }
 
 
-
-
 int crypt_write_signed (BODY * a, STATE * s, const char *tempfile)
 {
   FILE *fp;
@@ -511,8 +334,6 @@ void convert_to_7bit (BODY * a)
 }
 
 
-
-
 void crypt_extract_keys_from_messages (HEADER * h)
 {
   int i;
@@ -520,9 +341,9 @@ void crypt_extract_keys_from_messages (HEADER * h)
   address_t *tmp = NULL;
   FILE *fpout;
 
-  mutt_mktemp (tempfname);
-  if (!(fpout = safe_fopen (tempfname, "w"))) {
-    mutt_perror (tempfname);
+  fpout = m_tempfile(tempfname, sizeof(tempfname), NONULL(Tempdir), NULL);
+  if (!fpout) {
+    mutt_error(_("Could not create temporary file"));
     return;
   }