projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use m_tempfile instead of mutt_mktemp (again and again)
[apps/madmutt.git]
/
lib-crypt
/
smime.c
diff --git
a/lib-crypt/smime.c
b/lib-crypt/smime.c
index
7932525
..
0080b6a
100644
(file)
--- a/
lib-crypt/smime.c
+++ b/
lib-crypt/smime.c
@@
-9,42
+9,26
@@
* please see the file GPL in the top level source directory.
*/
* 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
#ifdef HAVE_SYS_RESOURCE_H
# include <sys/resource.h>
#endif
-#include <lib-lib/lib-lib.h>
-
#include <lib-mime/mime.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 "alias.h"
#include "handler.h"
#include "copy.h"
#include "alias.h"
#include "alias.h"
#include "handler.h"
#include "copy.h"
#include "alias.h"
+
#include "crypt.h"
#include "crypt.h"
+#include "smime.h"
struct smime_command_context {
const char *key; /* %k */
struct smime_command_context {
const char *key; /* %k */
@@
-585,7
+569,7
@@
char *smime_get_field_from_db (char *mailbox, char *query, short public,
}
}
}
}
-
safe_fclose
(&fp);
+
m_fclose
(&fp);
if (ask) {
if (public && *fields[4] == 'u')
if (ask) {
if (public && *fields[4] == 'u')
@@
-625,15
+609,11
@@
char *smime_get_field_from_db (char *mailbox, char *query, short public,
return m_strdup(key);
}
return m_strdup(key);
}
-
-
-
/*
This sets the '*ToUse' variables for an upcoming decryption, where
the reuquired key is different from SmimeDefaultKey.
*/
/*
This sets the '*ToUse' variables for an upcoming decryption, where
the reuquired key is different from SmimeDefaultKey.
*/
-
-void _smime_getkeys (char *mailbox)
+static void _smime_getkeys (char *mailbox)
{
char *k = NULL;
char buf[STRING];
{
char *k = NULL;
char buf[STRING];
@@
-753,7
+733,7
@@
char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
if (fqdn)
rfc822_qualify (tmp, fqdn);
if (fqdn)
rfc822_qualify (tmp, fqdn);
- address_list_uniq(
&
tmp);
+ address_list_uniq(tmp);
for (p = tmp; p; p = p->next) {
char buf[LONG_STRING];
for (p = tmp; p; p = p->next) {
char buf[LONG_STRING];
@@
-798,15
+778,15
@@
static int smime_handle_cert_email (char *certificate, char *mailbox,
int ret = -1, count = 0;
pid_t thepid;
int ret = -1, count = 0;
pid_t thepid;
-
mutt_mktemp (tmpfname
);
- if (
(fperr = safe_fopen (tmpfname, "w+")) == NULL
) {
+
fperr = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL
);
+ if (
!fperr
) {
mutt_perror (tmpfname);
return 1;
}
mutt_unlink (tmpfname);
mutt_perror (tmpfname);
return 1;
}
mutt_unlink (tmpfname);
-
mutt_mktemp (tmpfname
);
- if (
(fpout = safe_fopen (tmpfname, "w+")) == NULL
) {
+
fpout = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL
);
+ if (
!fpout
) {
fclose (fperr);
mutt_perror (tmpfname);
return 1;
fclose (fperr);
mutt_perror (tmpfname);
return 1;
@@
-884,15
+864,15
@@
static char *smime_extract_certificate (char *infile)
int empty;
int empty;
-
mutt_mktemp (tmpfname
);
- if (
(fperr = safe_fopen (tmpfname, "w+")) == NULL
) {
+
fperr = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL
);
+ if (
!fperr
) {
mutt_perror (tmpfname);
return NULL;
}
mutt_unlink (tmpfname);
mutt_perror (tmpfname);
return NULL;
}
mutt_unlink (tmpfname);
-
mutt_mktemp (pk7out
);
- if (
(fpout = safe_fopen (pk7out, "w+")) == NULL
) {
+
fpout = m_tempfile (pk7out, sizeof(tmpfname), NONULL(Tempdir), NULL
);
+ if (
!fpout
) {
fclose (fperr);
mutt_perror (pk7out);
return NULL;
fclose (fperr);
mutt_perror (pk7out);
return NULL;
@@
-920,21
+900,21
@@
static char *smime_extract_certificate (char *infile)
rewind (fpout);
rewind (fperr);
fflush (fperr);
rewind (fpout);
rewind (fperr);
fflush (fperr);
+
empty = (fgetc (fpout) == EOF);
empty = (fgetc (fpout) == EOF);
+
+ fclose (fpout);
+
if (empty) {
mutt_perror (pk7out);
mutt_copy_stream (fperr, stdout);
if (empty) {
mutt_perror (pk7out);
mutt_copy_stream (fperr, stdout);
- fclose (fpout);
fclose (fperr);
mutt_unlink (pk7out);
return NULL;
fclose (fperr);
mutt_unlink (pk7out);
return NULL;
-
}
}
-
- fclose (fpout);
- mutt_mktemp (certfile);
- if ((fpout = safe_fopen (certfile, "w+")) == NULL) {
+ fpout = m_tempfile (certfile, sizeof(certfile), NONULL(Tempdir), NULL);
+ if (!fpout) {
fclose (fperr);
mutt_unlink (pk7out);
mutt_perror (certfile);
fclose (fperr);
mutt_unlink (pk7out);
mutt_perror (certfile);
@@
-987,17
+967,15
@@
static char *smime_extract_signer_certificate (char *infile)
pid_t thepid;
int empty;
pid_t thepid;
int empty;
-
- mutt_mktemp (tmpfname);
- if ((fperr = safe_fopen (tmpfname, "w+")) == NULL) {
+ fperr = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL);
+ if (!fperr) {
mutt_perror (tmpfname);
return NULL;
}
mutt_unlink (tmpfname);
mutt_perror (tmpfname);
return NULL;
}
mutt_unlink (tmpfname);
-
- mutt_mktemp (certfile);
- if ((fpout = safe_fopen (certfile, "w+")) == NULL) {
+ m_tempfile (certfile, sizeof(certfile), NONULL(Tempdir), NULL);
+ if (!fpout) {
fclose (fperr);
mutt_perror (certfile);
return NULL;
fclose (fperr);
mutt_perror (certfile);
return NULL;
@@
-1041,9
+1019,6
@@
static char *smime_extract_signer_certificate (char *infile)
return m_strdup(certfile);
}
return m_strdup(certfile);
}
-
-
-
/* Add a certificate and update index file (externally). */
void smime_invoke_import (char *infile, char *mailbox __attribute__ ((unused)))
/* Add a certificate and update index file (externally). */
void smime_invoke_import (char *infile, char *mailbox __attribute__ ((unused)))
@@
-1052,22
+1027,21
@@
void smime_invoke_import (char *infile, char *mailbox __attribute__ ((unused)))
FILE *smimein = NULL, *fpout = NULL, *fperr = NULL;
pid_t thepid = -1;
FILE *smimein = NULL, *fpout = NULL, *fperr = NULL;
pid_t thepid = -1;
-
mutt_mktemp (tmpfname
);
- if (
(fperr = safe_fopen (tmpfname, "w+")) == NULL
) {
+
fperr = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL
);
+ if (
!fperr
) {
mutt_perror (tmpfname);
return;
}
mutt_unlink (tmpfname);
mutt_perror (tmpfname);
return;
}
mutt_unlink (tmpfname);
-
mutt_mktemp (tmpfname
);
- if (
(fpout = safe_fopen (tmpfname, "w+")) == NULL
) {
+
fpout = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL
);
+ if (
!fpout
) {
fclose (fperr);
mutt_perror (tmpfname);
return;
}
mutt_unlink (tmpfname);
fclose (fperr);
mutt_perror (tmpfname);
return;
}
mutt_unlink (tmpfname);
-
buf[0] = '\0';
if (option (OPTASKCERTLABEL))
mutt_get_field ("Label for certificate:", buf, sizeof (buf), 0);
buf[0] = '\0';
if (option (OPTASKCERTLABEL))
mutt_get_field ("Label for certificate:", buf, sizeof (buf), 0);
@@
-1114,8
+1088,8
@@
int smime_verify_sender (HEADER * h)
FILE *fpout;
int retval = 1;
FILE *fpout;
int retval = 1;
-
mutt_mktemp (tempfname
);
- if (!
(fpout = safe_fopen (tempfname, "w"))
) {
+
fpout = m_tempfile (tempfname, sizeof(tempfname), NONULL(Tempdir), NULL
);
+ if (!
fpout
) {
mutt_perror (tempfname);
return 1;
}
mutt_perror (tempfname);
return 1;
}
@@
-1214,14
+1188,14
@@
BODY *smime_build_smime_entity (BODY * a, char *certlist)
int err = 0, empty;
pid_t thepid;
int err = 0, empty;
pid_t thepid;
-
mutt_mktemp (tempfile
);
- if (
(fpout = safe_fopen (tempfile, "w+")) == NULL
) {
+
fpout = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (
!fpout
) {
mutt_perror (tempfile);
mutt_perror (tempfile);
- return
(NULL)
;
+ return
NULL
;
}
}
-
mutt_mktemp (smimeerrfile
);
- if (
(smimeerr = safe_fopen (smimeerrfile, "w+")) == NULL
) {
+
smimeerr = m_tempfile (smimeerrfile, sizeof(smimeerrfile), NONULL(Tempdir), NULL
);
+ if (
!smimeerr
) {
mutt_perror (smimeerrfile);
fclose (fpout);
mutt_unlink (tempfile);
mutt_perror (smimeerrfile);
fclose (fpout);
mutt_unlink (tempfile);
@@
-1229,8
+1203,8
@@
BODY *smime_build_smime_entity (BODY * a, char *certlist)
}
mutt_unlink (smimeerrfile);
}
mutt_unlink (smimeerrfile);
-
mutt_mktemp (smimeinfile
);
- if (
(fptmp = safe_fopen (smimeinfile, "w+")) == NULL
) {
+
fptmp = m_tempfile (smimeinfile, sizeof(smimeinfile), NONULL(Tempdir), NULL
);
+ if (
!fptmp
) {
mutt_perror (smimeinfile);
mutt_unlink (tempfile);
fclose (fpout);
mutt_perror (smimeinfile);
mutt_unlink (tempfile);
fclose (fpout);
@@
-1339,14
+1313,14
@@
BODY *smime_sign_message (BODY * a)
convert_to_7bit (a); /* Signed data _must_ be in 7-bit format. */
convert_to_7bit (a); /* Signed data _must_ be in 7-bit format. */
-
mutt_mktemp (filetosign
);
- if (
(sfp = safe_fopen (filetosign, "w+")) == NULL
) {
+
sfp = m_tempfile (filetosign, sizeof(filetosign), NONULL(Tempdir), NULL
);
+ if (
!sfp
) {
mutt_perror (filetosign);
return NULL;
}
mutt_perror (filetosign);
return NULL;
}
-
mutt_mktemp (signedfile
);
- if (
(smimeout = safe_fopen (signedfile, "w+")) == NULL
) {
+
smimeout = m_tempfile (signedfile, sizeof(signedfile), NONULL(Tempdir), NULL
);
+ if (
!smimeout
) {
mutt_perror (signedfile);
fclose (sfp);
mutt_unlink (filetosign);
mutt_perror (signedfile);
fclose (sfp);
mutt_unlink (filetosign);
@@
-1528,9
+1502,8
@@
int smime_verify_one (BODY * sigbdy, STATE * s, const char *tempfile)
sigbdy->type = origType;
sigbdy->type = origType;
-
- mutt_mktemp (smimeerrfile);
- if (!(smimeerr = safe_fopen (smimeerrfile, "w+"))) {
+ smimeerr = m_tempfile(smimeerrfile, sizeof(smimeerrfile), NONULL(Tempdir), NULL);
+ if (!smimeerr) {
mutt_perror (smimeerrfile);
mutt_unlink (signedfile);
return -1;
mutt_perror (smimeerrfile);
mutt_unlink (signedfile);
return -1;
@@
-1611,29
+1584,25
@@
static BODY *smime_handle_entity (BODY * m, STATE * s, FILE * outFile)
if (!(type & APPLICATION_SMIME))
return NULL;
if (!(type & APPLICATION_SMIME))
return NULL;
-
mutt_mktemp (outfile
);
- if (
(smimeout = safe_fopen (outfile, "w+")) == NULL
) {
+
smimeout = m_tempfile (outfile, sizeof(outfile), NONULL(Tempdir), NULL
);
+ if (
!smimeout
) {
mutt_perror (outfile);
return NULL;
}
mutt_perror (outfile);
return NULL;
}
-
mutt_mktemp (errfile
);
- if (
(smimeerr = safe_fopen (errfile, "w+")) == NULL
) {
+
smimeerr = m_tempfile(errfile, sizeof(errfile), NONULL(Tempdir), NULL
);
+ if (
!smimeerr
) {
mutt_perror (errfile);
fclose (smimeout);
mutt_perror (errfile);
fclose (smimeout);
- smimeout = NULL;
return NULL;
}
mutt_unlink (errfile);
return NULL;
}
mutt_unlink (errfile);
-
- mutt_mktemp (tmpfname);
- if ((tmpfp = safe_fopen (tmpfname, "w+")) == NULL) {
+ tmpfp = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL);
+ if (!tmpfp) {
mutt_perror (tmpfname);
fclose (smimeout);
mutt_perror (tmpfname);
fclose (smimeout);
- smimeout = NULL;
fclose (smimeerr);
fclose (smimeerr);
- smimeerr = NULL;
return NULL;
}
return NULL;
}
@@
-1709,11
+1678,10
@@
static BODY *smime_handle_entity (BODY * m, STATE * s, FILE * outFile)
if (outFile)
fpout = outFile;
else {
if (outFile)
fpout = outFile;
else {
-
mutt_mktemp (tmptmpfname
);
- if (
(fpout = safe_fopen (tmptmpfname, "w+")) == NULL
) {
+
fpout = m_tempfile (tmptmpfname, sizeof(tmptmpfname), NONULL(Tempdir), NULL
);
+ if (
!fpout
) {
mutt_perror (tmptmpfname);
fclose (smimeout);
mutt_perror (tmptmpfname);
fclose (smimeout);
- smimeout = NULL;
return NULL;
}
}
return NULL;
}
}
@@
-1808,8
+1776,8
@@
int smime_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, BODY ** cur)
s.fpin = fpin;
fseeko (s.fpin, b->offset, 0);
s.fpin = fpin;
fseeko (s.fpin, b->offset, 0);
-
mutt_mktemp (tempfile
);
- if (
(tmpfp = safe_fopen (tempfile, "w+")) == NULL
) {
+
tmpfp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (
!tmpfp
) {
mutt_perror (tempfile);
return (-1);
}
mutt_perror (tempfile);
return (-1);
}
@@
-1824,8
+1792,8
@@
int smime_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, BODY ** cur)
s.fpin = tmpfp;
s.fpout = 0;
s.fpin = tmpfp;
s.fpout = 0;
-
mutt_mktemp (tempfile
);
- if (
(*fpout = safe_fopen (tempfile, "w+")) == NULL
) {
+
*fpout = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (
!*fpout
) {
mutt_perror (tempfile);
rv = -1;
goto bail;
mutt_perror (tempfile);
rv = -1;
goto bail;
@@
-1845,7
+1813,7
@@
bail:
b->length = tmplength;
b->offset = tmpoffset;
b->length = tmplength;
b->offset = tmpoffset;
-
safe_fclose
(&tmpfp);
+
m_fclose
(&tmpfp);
if (*fpout)
rewind (*fpout);
return (rv);
if (*fpout)
rewind (*fpout);
return (rv);