Changes to anno.man.

[nmh] / uip / whatnowsbr.c

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 69cbf795d8bebab4c26db28b480f83baeaa25990..919dd901b291d43fbd6c13ba44b0813963994988 100644 (file)
--- 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");
                }
                if (fgets(cwd, sizeof (cwd), f) == NULL) {
                    advise (buf, "fgets");
                }

-                TrimSuffixC(cwd, '\n');
+                trim_suffix_c(cwd, '\n');

                pclose(f);
            }
            else {
                pclose(f);
            }
            else {


@@ -339,7 +339,7 @@ WhatNow (int argc, char **argv)
 
        case PWDCMDSW:
            /* Print the working directory for attachments */
 
        case PWDCMDSW:
            /* Print the working directory for attachments */

-           printf("%s\n", cwd);
+           puts(cwd);

            break;
 
        case LSCMDSW:
            break;
 
        case LSCMDSW:


@@ -435,7 +435,7 @@ WhatNow (int argc, char **argv)
                while (fgets(shell, sizeof (shell), f) != NULL) {
                    char *ctype;
 
                while (fgets(shell, sizeof (shell), f) != NULL) {
                    char *ctype;
 

-                    TrimSuffixC(shell, '\n');
+                    trim_suffix_c(shell, '\n');

 
                    if (*shell == '/') {
                        strncpy(file, shell, sizeof(file));
 
                    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) {
            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);
                    annotate(drft, ATTACH_FIELD, shell, 1, 0, 0, 1);
                }
                pclose(f);


@@ -954,6 +954,8 @@ buildfile (char **argp, char *file)
     X("tls", TLSminc(-3), TLSSW) \
     X("initialtls", TLSminc(-10), INITTLSSW) \
     X("notls", TLSminc(-5), NTLSSW) \
     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) \
     X("sendmail program", 0, MTSSM) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 2, MTSSW) \
     X("messageid localname|random", 2, MESSAGEIDSW) \


@@ -1134,6 +1136,8 @@ sendit (char *sp, char **arg, char *file, int pushed)
                case TLSSW:
                case INITTLSSW:
                case NTLSSW:
                case TLSSW:
                case INITTLSSW:
                case NTLSSW:

+               case CERTVERSW:
+               case NOCERTVERSW:

                    vec[vecp++] = --cp;
                    continue;
 
                    vec[vecp++] = --cp;
                    continue;