/* This is almost identical to ppgp's invoking interface. */
static const char *
-_mutt_fmt_smime_command (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)
+_mutt_fmt_smime_command (char *dest, ssize_t destlen,
+ char op, const char *src, const char *prefix,
+ const char *ifstr, const char *elstr,
+ anytype data, format_flag flags)
{
char fmt[16];
- struct smime_command_context *cctx = (struct smime_command_context *) data;
+ struct smime_command_context *cctx = data.ptr;
int optional = (flags & M_FORMAT_OPTIONAL);
switch (op) {
break;
}
- if (optional)
- mutt_FormatString (dest, destlen, ifstring, _mutt_fmt_smime_command,
- data, 0);
- else if (flags & M_FORMAT_OPTIONAL)
- mutt_FormatString (dest, destlen, elsestring, _mutt_fmt_smime_command,
- data, 0);
+ if (flags & M_FORMAT_OPTIONAL)
+ m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+ _mutt_fmt_smime_command, data, 0);
- return (src);
+ return src;
}
struct smime_command_context *cctx,
const char *fmt)
{
- mutt_FormatString (d, dlen, NONULL (fmt), _mutt_fmt_smime_command,
- (unsigned long) cctx, 0);
+ m_strformat(d, dlen, 0, fmt, _mutt_fmt_smime_command, cctx, 0);
}
static pid_t smime_invoke (FILE ** smimein, FILE ** smimeout,
int ret = -1, count = 0;
pid_t thepid;
- fperr = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL);
+ fperr = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(MCore.tmpdir), NULL);
if (!fperr) {
mutt_perror (tmpfname);
return 1;
}
mutt_unlink (tmpfname);
- fpout = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL);
+ fpout = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(MCore.tmpdir), NULL);
if (!fpout) {
m_fclose(&fperr);
mutt_perror (tmpfname);
int empty;
- fperr = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL);
+ fperr = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(MCore.tmpdir), NULL);
if (!fperr) {
mutt_perror (tmpfname);
return NULL;
}
mutt_unlink (tmpfname);
- fpout = m_tempfile (pk7out, sizeof(tmpfname), NONULL(Tempdir), NULL);
+ fpout = m_tempfile (pk7out, sizeof(tmpfname), NONULL(MCore.tmpdir), NULL);
if (!fpout) {
m_fclose(&fperr);
mutt_perror (pk7out);
return NULL;
}
- fpout = m_tempfile (certfile, sizeof(certfile), NONULL(Tempdir), NULL);
+ fpout = m_tempfile (certfile, sizeof(certfile), NONULL(MCore.tmpdir), NULL);
if (!fpout) {
m_fclose(&fperr);
mutt_unlink (pk7out);
pid_t thepid;
int empty;
- fperr = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL);
+ fperr = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(MCore.tmpdir), NULL);
if (!fperr) {
mutt_perror (tmpfname);
return NULL;
}
mutt_unlink (tmpfname);
- m_tempfile (certfile, sizeof(certfile), NONULL(Tempdir), NULL);
+ m_tempfile (certfile, sizeof(certfile), NONULL(MCore.tmpdir), NULL);
if (!fpout) {
m_fclose(&fperr);
mutt_perror (certfile);
FILE *smimein = NULL, *fpout = NULL, *fperr = NULL;
pid_t thepid = -1;
- fperr = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL);
+ fperr = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(MCore.tmpdir), NULL);
if (!fperr) {
mutt_perror (tmpfname);
return;
}
mutt_unlink (tmpfname);
- fpout = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL);
+ fpout = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(MCore.tmpdir), NULL);
if (!fpout) {
m_fclose(&fperr);
mutt_perror (tmpfname);
FILE *fpout;
int retval = 1;
- fpout = m_tempfile (tempfname, sizeof(tempfname), NONULL(Tempdir), NULL);
+ fpout = m_tempfile (tempfname, sizeof(tempfname), NONULL(MCore.tmpdir), NULL);
if (!fpout) {
mutt_perror (_("Can't create temporary file"));
return 1;
int err = 0, empty;
pid_t thepid;
- fpout = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ fpout = m_tempfile (tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
if (!fpout) {
mutt_perror (_("Can't create temporary file"));
return NULL;
}
- smimeerr = m_tempfile (smimeerrfile, sizeof(smimeerrfile), NONULL(Tempdir), NULL);
+ smimeerr = m_tempfile (smimeerrfile, sizeof(smimeerrfile), NONULL(MCore.tmpdir), NULL);
if (!smimeerr) {
mutt_perror (smimeerrfile);
m_fclose(&fpout);
}
mutt_unlink (smimeerrfile);
- fptmp = m_tempfile (smimeinfile, sizeof(smimeinfile), NONULL(Tempdir), NULL);
+ fptmp = m_tempfile (smimeinfile, sizeof(smimeinfile), NONULL(MCore.tmpdir), NULL);
if (!fptmp) {
mutt_perror (smimeinfile);
mutt_unlink (tempfile);
convert_to_7bit (a); /* Signed data _must_ be in 7-bit format. */
- sfp = m_tempfile (filetosign, sizeof(filetosign), NONULL(Tempdir), NULL);
+ sfp = m_tempfile (filetosign, sizeof(filetosign), NONULL(MCore.tmpdir), NULL);
if (!sfp) {
mutt_perror (filetosign);
return NULL;
}
- smimeout = m_tempfile (signedfile, sizeof(signedfile), NONULL(Tempdir), NULL);
+ smimeout = m_tempfile (signedfile, sizeof(signedfile), NONULL(MCore.tmpdir), NULL);
if (!smimeout) {
mutt_perror (signedfile);
m_fclose(&sfp);
sigbdy->type = origType;
- smimeerr = m_tempfile(smimeerrfile, sizeof(smimeerrfile), NONULL(Tempdir), NULL);
+ smimeerr = m_tempfile(smimeerrfile, sizeof(smimeerrfile), NONULL(MCore.tmpdir), NULL);
if (!smimeerr) {
mutt_perror (smimeerrfile);
mutt_unlink (signedfile);
if (!(type & APPLICATION_SMIME))
return NULL;
- smimeout = m_tempfile (outfile, sizeof(outfile), NONULL(Tempdir), NULL);
+ smimeout = m_tempfile (outfile, sizeof(outfile), NONULL(MCore.tmpdir), NULL);
if (!smimeout) {
mutt_perror (outfile);
return NULL;
}
- smimeerr = m_tempfile(errfile, sizeof(errfile), NONULL(Tempdir), NULL);
+ smimeerr = m_tempfile(errfile, sizeof(errfile), NONULL(MCore.tmpdir), NULL);
if (!smimeerr) {
mutt_perror (errfile);
m_fclose(&smimeout);
}
mutt_unlink (errfile);
- tmpfp = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(Tempdir), NULL);
+ tmpfp = m_tempfile (tmpfname, sizeof(tmpfname), NONULL(MCore.tmpdir), NULL);
if (!tmpfp) {
mutt_perror (tmpfname);
m_fclose(&smimeout);
if (outFile)
fpout = outFile;
else {
- fpout = m_tempfile (tmptmpfname, sizeof(tmptmpfname), NONULL(Tempdir), NULL);
+ fpout = m_tempfile (tmptmpfname, sizeof(tmptmpfname), NONULL(MCore.tmpdir), NULL);
if (!fpout) {
mutt_perror (tmptmpfname);
m_fclose(&smimeout);
s.fpin = fpin;
fseeko (s.fpin, b->offset, 0);
- tmpfp = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ tmpfp = m_tempfile (tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
if (!tmpfp) {
mutt_perror (_("Can't create temporary file"));
return (-1);
s.fpin = tmpfp;
s.fpout = 0;
- *fpout = m_tempfile (tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ *fpout = m_tempfile (tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
if (!*fpout) {
mutt_perror (_("Can't create temporary file"));
rv = -1;