X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/30dd986c9c8d1a6fc75a7442c8ecf9eb16346f33..0328f2c528b4a07c27cac8f3acfc39ebc873cbdd:/uip/whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 69cbf795..61cf45d6 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -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:
@@ -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);
@@ -834,6 +834,7 @@ sendfile (char **arg, char *file, int pushsw)
     switch (child_id) {
 	case NOTOK:
 	    advise (NULL, "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) \
@@ -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:
@@ -1181,6 +1187,7 @@ sendit (char *sp, char **arg, char *file, int pushed)
 			advise (NULL, "missing argument to %s", argp[-2]);
 			return;
 		    }
+		    /* FALLTHRU */
 		case SNDRFSW:
 		    continue;