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
/
crypt-gpgme.c
diff --git
a/lib-crypt/crypt-gpgme.c
b/lib-crypt/crypt-gpgme.c
index
a348e6f
..
b3304f5
100644
(file)
--- a/
lib-crypt/crypt-gpgme.c
+++ b/
lib-crypt/crypt-gpgme.c
@@
-348,10
+348,9
@@
static gpgme_data_t body_to_data_object (BODY * a, int convert)
int err = 0;
gpgme_data_t data;
int err = 0;
gpgme_data_t data;
- mutt_mktemp (tempfile);
- fptmp = safe_fopen (tempfile, "w+");
+ fptmp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
if (!fptmp) {
if (!fptmp) {
- mutt_perror (
tempfile
);
+ mutt_perror (
_("Can't create temporary file")
);
return NULL;
}
return NULL;
}
@@
-457,10
+456,9
@@
static char *data_object_to_tempfile (gpgme_data_t data, FILE ** ret_fp)
FILE *fp;
ssize_t nread = 0;
FILE *fp;
ssize_t nread = 0;
- mutt_mktemp (tempfile);
- fp = safe_fopen (tempfile, "w+");
+ fp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
if (!fp) {
if (!fp) {
- mutt_perror (
tempfile
);
+ mutt_perror (
_("Can't create temporary file")
);
return NULL;
}
return NULL;
}
@@
-1469,9
+1467,9
@@
int pgp_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b, BODY ** cur)
p_clear(&s, 1);
s.fpin = fpin;
p_clear(&s, 1);
s.fpin = fpin;
-
mutt_mktemp (tempfile
);
- if (!
(*fpout = safe_fopen (tempfile, "w+"))
) {
- mutt_perror (
tempfile
);
+
*fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (!
*fpout
) {
+ mutt_perror (
_("Can't create temporary file")
);
return -1;
}
unlink (tempfile);
return -1;
}
unlink (tempfile);
@@
-1514,9
+1512,9
@@
int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
p_clear(&s, 1);
s.fpin = fpin;
fseeko (s.fpin, b->offset, 0);
p_clear(&s, 1);
s.fpin = fpin;
fseeko (s.fpin, b->offset, 0);
-
mutt_mktemp (tempfile
);
- if (!
(tmpfp = safe_fopen (tempfile, "w+"))
) {
- mutt_perror (
tempfile
);
+
tmpfp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (!
tmpfp
) {
+ mutt_perror (
_("Can't create temporary file")
);
return -1;
}
mutt_unlink (tempfile);
return -1;
}
mutt_unlink (tempfile);
@@
-1531,9
+1529,9
@@
int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
p_clear(&s, 1);
s.fpin = tmpfp;
s.fpout = 0;
p_clear(&s, 1);
s.fpin = tmpfp;
s.fpout = 0;
-
mutt_mktemp (tempfile
);
- if (!
(*fpout = safe_fopen (tempfile, "w+"))
) {
- mutt_perror (
tempfile
);
+
*fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (!
*fpout
) {
+ mutt_perror (
_("Can't create temporary file")
);
return -1;
}
mutt_unlink (tempfile);
return -1;
}
mutt_unlink (tempfile);
@@
-1566,9
+1564,9
@@
int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
p_clear(&s, 1);
s.fpin = *fpout;
fseeko (s.fpin, bb->offset, 0);
p_clear(&s, 1);
s.fpin = *fpout;
fseeko (s.fpin, bb->offset, 0);
-
mutt_mktemp (tempfile
);
- if (!
(tmpfp = safe_fopen (tempfile, "w+"))
) {
- mutt_perror (
tempfile
);
+
tmpfp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (!
tmpfp
) {
+ mutt_perror (
_("Can't create temporary file")
);
return -1;
}
mutt_unlink (tempfile);
return -1;
}
mutt_unlink (tempfile);
@@
-1584,9
+1582,9
@@
int smime_gpgme_decrypt_mime (FILE * fpin, FILE ** fpout, BODY * b,
p_clear(&s, 1);
s.fpin = tmpfp;
s.fpout = 0;
p_clear(&s, 1);
s.fpin = tmpfp;
s.fpout = 0;
-
mutt_mktemp (tempfile
);
- if (!
(*fpout = safe_fopen (tempfile, "w+"))
) {
- mutt_perror (
tempfile
);
+
*fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (!
*fpout
) {
+ mutt_perror (
_("Can't create temporary file")
);
return -1;
}
mutt_unlink (tempfile);
return -1;
}
mutt_unlink (tempfile);
@@
-1995,8
+1993,8
@@
int pgp_gpgme_encrypted_handler (BODY * a, STATE * s)
/* Move forward to the application/pgp-encrypted body. */
a = a->next;
/* Move forward to the application/pgp-encrypted body. */
a = a->next;
-
mutt_mktemp (tempfile
);
- if (!
(fpout = safe_fopen (tempfile, "w+"))
) {
+
fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (!
fpout
) {
if (s->flags & M_DISPLAY)
state_attach_puts (_("[-- Error: could not create temporary file! "
"--]\n"), s);
if (s->flags & M_DISPLAY)
state_attach_puts (_("[-- Error: could not create temporary file! "
"--]\n"), s);
@@
-2055,8
+2053,8
@@
int smime_gpgme_application_handler (BODY * a, STATE * s)
int rc = 0;
a->warnsig = 0;
int rc = 0;
a->warnsig = 0;
-
mutt_mktemp (tempfile
);
- if (!
(fpout = safe_fopen (tempfile, "w+"))
) {
+
fpout = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (!
fpout
) {
if (s->flags & M_DISPLAY)
state_attach_puts (_("[-- Error: could not create temporary file! "
"--]\n"), s);
if (s->flags & M_DISPLAY)
state_attach_puts (_("[-- Error: could not create temporary file! "
"--]\n"), s);
@@
-2927,10
+2925,9
@@
static void verify_key (crypt_key_t * key)
gpgme_key_t k = NULL;
int maxdepth = 100;
gpgme_key_t k = NULL;
int maxdepth = 100;
-
mutt_mktemp (tempfile
);
- if (!
(fp = safe_fopen (tempfile, "w"))
) {
+
fp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (!
fp
) {
mutt_perror (_("Can't create temporary file"));
mutt_perror (_("Can't create temporary file"));
-
return;
}
mutt_message _("Collecting data...");
return;
}
mutt_message _("Collecting data...");