X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/30dd986c9c8d1a6fc75a7442c8ecf9eb16346f33..791576c7f643c97ca087720751ea89f357c5b8fa:/uip/whatnowsbr.c diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c index 69cbf795..e2e0ceb6 100644 --- a/uip/whatnowsbr.c +++ b/uip/whatnowsbr.c @@ -199,11 +199,11 @@ WhatNow (int argc, char **argv) continue; case ATTACHSW: - advise(NULL, "The -attach switch is deprecated"); + inform("The -attach switch is deprecated"); continue; case NOATTACHSW: - advise(NULL, "The -noattach switch is deprecated"); + inform("The -noattach switch is deprecated"); continue; } } @@ -250,7 +250,7 @@ WhatNow (int argc, char **argv) if (msgnam) showfile (++argp, msgnam); else - advise (NULL, "no alternate message to display"); + inform("no alternate message to display"); break; case BUILDMIMESW: @@ -284,7 +284,7 @@ WhatNow (int argc, char **argv) removefile (drft); } else { if (stat (drft, &st) != NOTOK) - advise (NULL, "draft left on %s", drft); + inform("draft left on %s", drft); } done (1); @@ -328,7 +328,7 @@ WhatNow (int argc, char **argv) if (fgets(cwd, sizeof (cwd), f) == NULL) { advise (buf, "fgets"); } - TrimSuffixC(cwd, '\n'); + trim_suffix_c(cwd, '\n'); pclose(f); } else { @@ -339,7 +339,7 @@ WhatNow (int argc, char **argv) case PWDCMDSW: /* Print the working directory for attachments */ - printf("%s\n", cwd); + puts(cwd); break; case LSCMDSW: @@ -385,7 +385,7 @@ WhatNow (int argc, char **argv) } if (n == -1) - advise(NULL, "usage is alist [-ln]."); + inform("usage is alist [-ln]."); else annolist(drft, ATTACH_FIELD, l, n); @@ -413,7 +413,7 @@ WhatNow (int argc, char **argv) } if (*(argp+1) == NULL) { - advise(NULL, "attach command requires file argument(s)."); + inform("attach command requires file argument(s)."); break; } @@ -435,7 +435,7 @@ WhatNow (int argc, char **argv) while (fgets(shell, sizeof (shell), f) != NULL) { char *ctype; - TrimSuffixC(shell, '\n'); + trim_suffix_c(shell, '\n'); if (*shell == '/') { strncpy(file, shell, sizeof(file)); @@ -520,7 +520,7 @@ WhatNow (int argc, char **argv) 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); @@ -532,7 +532,7 @@ WhatNow (int argc, char **argv) default: /* Unknown command */ - advise (NULL, "say what?"); + inform("say what?"); break; } } @@ -741,9 +741,9 @@ editfile (char **ed, char **arg, char *file, int use, struct msgs *mp, && (!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"? */ @@ -833,7 +833,8 @@ sendfile (char **arg, char *file, int pushsw) 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) @@ -954,6 +955,8 @@ buildfile (char **argp, char *file) 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) \ @@ -1069,7 +1072,7 @@ sendit (char *sp, char **arg, char *file, int pushed) ambigsw (cp, sendswitches); return; case UNKWNSW: - advise (NULL, "-%s unknown\n", cp); + inform("-%s unknown\n", cp); return; case SHELPSW: @@ -1089,7 +1092,7 @@ sendit (char *sp, char **arg, char *file, int pushed) 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; @@ -1117,7 +1120,8 @@ sendit (char *sp, char **arg, char *file, int pushed) continue; case DEBUGSW: - debugsw++; /* fall */ + debugsw++; + /* FALLTHRU */ case NFILTSW: case FRMTSW: case NFRMTSW: @@ -1134,6 +1138,8 @@ sendit (char *sp, char **arg, char *file, int pushed) case TLSSW: case INITTLSSW: case NTLSSW: + case CERTVERSW: + case NOCERTVERSW: vec[vecp++] = --cp; continue; @@ -1155,7 +1161,7 @@ sendit (char *sp, char **arg, char *file, int pushed) case SASLMECHSW: saslmech = *argp; - /* fall thru */ + /* FALLTHRU */ case ALIASW: case FILTSW: case WIDTHSW: @@ -1168,7 +1174,7 @@ sendit (char *sp, char **arg, char *file, int pushed) 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; @@ -1178,25 +1184,26 @@ sendit (char *sp, char **arg, char *file, int pushed) 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"); + inform("The -attach switch is deprecated"); continue; case SNDNOATTACHSW: - advise(NULL, "The -noattach switch is deprecated"); + inform("The -noattach switch is deprecated"); continue; case SNDATTACHFORMAT: - advise(NULL, "The -attachformat switch is deprecated"); + inform("The -attachformat switch is deprecated"); continue; } } - advise (NULL, "usage: %s [switches]", sp); + inform("usage: %s [switches]", sp); return; } @@ -1344,7 +1351,7 @@ checkmimeheader (char *drft) 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;