-
-/*
- * whatnowsbr.c -- the WhatNow shell
+/* whatnowsbr.c -- the WhatNow shell
*
* This code is Copyright (c) 2002, by the authors of nmh. See the
* COPYRIGHT file in the root directory of the nmh distribution for
X("prompt string", 4, PRMPTSW) \
X("version", 0, VERSIONSW) \
X("help", 0, HELPSW) \
- X("attach header-field-name", -6, ATTACHSW) \
- X("noattach", -8, NOATTACHSW) \
#define X(sw, minchars, id) id,
if (!(myprompt = *argp++) || *myprompt == '-')
adios (NULL, "missing argument to %s", argp[-2]);
continue;
-
- case ATTACHSW:
- advise(NULL, "The -attach switch is deprecated");
- continue;
-
- case NOATTACHSW:
- advise(NULL, "The -noattach switch is deprecated");
- continue;
}
}
if (drft)
if (msgnam)
showfile (++argp, msgnam);
else
- advise (NULL, "no alternate message to display");
+ inform("no alternate message to display");
break;
case BUILDMIMESW:
removefile (drft);
} else {
if (stat (drft, &st) != NOTOK)
- advise (NULL, "draft left on %s", drft);
+ inform("draft left on %s", drft);
}
done (1);
if (fgets(cwd, sizeof (cwd), f) == NULL) {
advise (buf, "fgets");
}
- TrimSuffixC(cwd, '\n');
+ trim_suffix_c(cwd, '\n');
pclose(f);
}
else {
case PWDCMDSW:
/* Print the working directory for attachments */
- printf("%s\n", cwd);
+ puts(cwd);
break;
case LSCMDSW:
}
if (n == -1)
- advise(NULL, "usage is alist [-ln].");
+ inform("usage is alist [-ln].");
else
annolist(drft, ATTACH_FIELD, l, n);
}
if (*(argp+1) == NULL) {
- advise(NULL, "attach command requires file argument(s).");
+ inform("attach command requires file argument(s).");
break;
}
while (fgets(shell, sizeof (shell), f) != NULL) {
char *ctype;
- TrimSuffixC(shell, '\n');
+ trim_suffix_c(shell, '\n');
if (*shell == '/') {
strncpy(file, shell, sizeof(file));
writelscmd(buf, sizeof(buf), "-d --", argp);
if ((f = popen_in_dir(cwd, buf, "r")) != NULL) {
while (fgets(shell, sizeof (shell), f) != NULL) {
- TrimSuffixC(shell, '\n');
+ trim_suffix_c(shell, '\n');
annotate(drft, ATTACH_FIELD, shell, 1, 0, 0, 1);
}
pclose(f);
default:
/* Unknown command */
- advise (NULL, "say what?");
+ inform("say what?");
break;
}
}
}
if (altmsg) {
if (mp)
- m_putenv ("mhfolder", mp->foldpath);
- m_putenv ("editalt", altpath);
+ setenv("mhfolder", mp->foldpath, 1);
+ setenv("editalt", altpath, 1);
}
vec = argsplit(*ed, &prog, &vecp);
&& (!reedit || (status & 0x00ff))) {
if (!use && (status & 0xff00) &&
(rename (file, cp = m_backup (file)) != NOTOK)) {
- advise (NULL, "problems with edit--draft left in %s", cp);
+ inform("problems with edit--draft left in %s", cp);
} else {
- advise (NULL, "problems with edit--%s preserved", file);
+ inform("problems with edit--%s preserved", file);
}
}
status = -2; /* maybe "reedit ? -2 : -1"? */
sleep (5);
switch (child_id) {
case NOTOK:
- advise (NULL, "unable to fork, so sending directly...");
+ inform("unable to fork, so sending directly...");
+ /* FALLTHRU */
case OK:
vec = argsplit(sendproc, &program, &vecp);
if (pushsw)
X("saslmech", SASLminc(5), SASLMECHSW) \
X("authservice", SASLminc(0), AUTHSERVICESW) \
X("user username", SASLminc(4), USERSW) \
- X("attach fieldname", 6, SNDATTACHSW) \
- X("noattach", 0, SNDNOATTACHSW) \
- X("attachformat", 7, SNDATTACHFORMAT) \
X("port server-port-name/number", 4, PORTSW) \
X("tls", TLSminc(-3), TLSSW) \
X("initialtls", TLSminc(-10), INITTLSSW) \
X("notls", TLSminc(-5), NTLSSW) \
+ X("certverify", TLSminc(-10), CERTVERSW) \
+ X("nocertverify", TLSminc(-12), NOCERTVERSW) \
X("sendmail program", 0, MTSSM) \
X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
X("messageid localname|random", 2, MESSAGEIDSW) \
ambigsw (cp, sendswitches);
return;
case UNKWNSW:
- advise (NULL, "-%s unknown\n", cp);
+ inform("-%s unknown\n", cp);
return;
case SHELPSW:
case SPLITSW:
if (!(cp = *argp++) || sscanf (cp, "%d", &splitsw) != 1) {
- advise (NULL, "missing argument to %s", argp[-2]);
+ inform("missing argument to %s", argp[-2]);
return;
}
continue;
continue;
case DEBUGSW:
- debugsw++; /* fall */
+ debugsw++;
+ /* FALLTHRU */
case NFILTSW:
case FRMTSW:
case NFRMTSW:
case TLSSW:
case INITTLSSW:
case NTLSSW:
+ case CERTVERSW:
+ case NOCERTVERSW:
vec[vecp++] = --cp;
continue;
case SASLMECHSW:
saslmech = *argp;
- /* fall thru */
+ /* FALLTHRU */
case ALIASW:
case FILTSW:
case WIDTHSW:
case MESSAGEIDSW:
vec[vecp++] = --cp;
if (!(cp = *argp++) || *cp == '-') {
- advise (NULL, "missing argument to %s", argp[-2]);
+ inform("missing argument to %s", argp[-2]);
return;
}
vec[vecp++] = cp;
case SDRFSW:
case SDRMSW:
if (!(cp = *argp++) || *cp == '-') {
- advise (NULL, "missing argument to %s", argp[-2]);
+ inform("missing argument to %s", argp[-2]);
return;
}
+ /* FALLTHRU */
case SNDRFSW:
continue;
-
- case SNDATTACHSW:
- advise(NULL, "The -attach switch is deprecated");
- continue;
- case SNDNOATTACHSW:
- advise(NULL, "The -noattach switch is deprecated");
- continue;
-
- case SNDATTACHFORMAT:
- advise(NULL, "The -attachformat switch is deprecated");
- continue;
}
}
- advise (NULL, "usage: %s [switches]", sp);
+ inform("usage: %s [switches]", sp);
return;
}
if ((cp = getenv ("SIGNATURE")) == NULL || *cp == 0)
if ((cp = context_find ("signature")) && *cp)
- m_putenv ("SIGNATURE", cp);
+ setenv("SIGNATURE", cp, 1);
if ((annotext = getenv ("mhannotate")) == NULL || *annotext == 0)
annotext = NULL;
{
FILE *f;
m_getfld_state_t gstate = 0;
- char buf[BUFSIZ], name[NAMESZ];
+ char buf[NMH_BUFSIZ], name[NAMESZ];
int state, retval = 0;
if ((f = fopen(drft, "r")) == NULL) {
case FLD:
case FLDPLUS:
if (strcasecmp(name, VRSN_FIELD) == 0) {
- advise(NULL, "Cannot use attach commands with already-"
+ inform("Cannot use attach commands with already-"
"formatted MIME message \"%s\"", drft);
retval = 1;
break;
projects / nmh / blobdiff