#define ANNOSW 0
{ "annotate", 0 },
#define NANNOSW 1
- { "noannotate", 0 },
+ { "noannotate", 2 },
#define EDITRSW 2
{ "editor editor", 0 },
#define FORMSW 3
#define WHATSW 7
{ "whatnowproc program", 0 },
#define VERSIONSW 8
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 9
{ "help", 0 },
-
-#ifdef MHE
-#define BILDSW 12
+#define BILDSW 10
{ "build", 5 }, /* interface from mhe */
-#endif /* MHE */
-
{ NULL, 0 }
};
char *form = NULL, buf[BUFSIZ], value[10];
char **argp, **arguments, *msgs[MAXARGS];
char *fmtstr;
-
-#ifdef MHE
int buildsw = 0;
-#endif /* MHE */
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
adios(NULL, "missing argument to %s",
argp[-2]);
continue;
-#ifdef MHE
+
case BILDSW:
- buildsw++; /* fall... */
+ buildsw++;
continue;
-#endif /* MHE */
case FORMSW:
if (!(form = *argp++) || *form == '-')
}
cwd = getcpy(pwd());
-
-#ifdef MHE
- strncpy(drft, buildsw ? toabsdir("draft")
- : m_draft(seq_beyond), sizeof(drft));
-#else
- strncpy(drft, m_draft(seq_beyond), sizeof(drft));
-#endif /* MHE */
+ strncpy(drft, buildsw ? toabsdir("draft") : m_draft(seq_beyond),
+ sizeof(drft));
+ /*
+ ** FIXME: (concerning MHE support (buildsw) only)
+ ** There's no check if the draft already exists. mmh has removed
+ ** this case by having the draft folder. I won't add code only to
+ ** handle this legacy issue for MHE. -- meillo@marmaro.de 2012-05
+ */
/*
** Forwarding a message.
add_forw_hdr(char *draft)
{
int msgnum;
- char buffer[BUFSIZ];
-
- snprintf(buffer, sizeof buffer, "anno -append -nodate '%s' "
- "-comp '%s' -text '+%s",
- draft, attach_hdr, mp->foldpath);
+ char buf[BUFSIZ];
+ char *vec[MAXARGS];
+ int vecp = 0;
+
+ vec[vecp++] = "anno";
+ vec[vecp++] = "-append";
+ vec[vecp++] = "-nodate";
+ vec[vecp++] = draft;
+ vec[vecp++] = "-comp";
+ vec[vecp++] = attach_hdr;
+ vec[vecp++] = "-text";
+ snprintf(buf, sizeof buf, "+%s", mp->foldpath);
for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
if (!is_selected(mp, msgnum)) {
continue;
}
- /* TODO: Check for buffer length! */
- strcat(buffer, " ");
- strcat(buffer, m_name(msgnum));
- }
- strcat(buffer, "'");
- /* TODO: This check is bad, but better than nothing */
- if (strlen(buffer) > BUFSIZ) {
- adios(NULL, "Too long attachment header line. Forward less messages.");
+ if (strlen(buf) + 1 + strlen(m_name(msgnum)) + 1
+ > sizeof buf) {
+ adios(NULL, "Attachment header line too long. "
+ "Forward less messages.");
+ }
+ strcat(buf, " ");
+ strcat(buf, m_name(msgnum));
}
- if (system(buffer) != 0) {
+ vec[vecp++] = buf;
+ vec[vecp] = NULL;
+ if (execprog(*vec, vec) != 0) {
advise(NULL, "unable to add attachment header");
}
}