sbr/vector.c: Rewrite BVEC_BYTES(n) macro to remove branch.

[nmh] / uip / whom.c

diff --git a/uip/whom.c b/uip/whom.c
index 3830e5eb07e3a4192090151b79ae98bbd9d2d162..edad5d778b7b0fed4eda1d5901464ce1b1911319 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -1,6 +1,4 @@
-
-/*
- * whom.c -- report to whom a message would be sent
+/* whom.c -- report to whom a message would be sent

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -8,8 +6,8 @@
  */
 
 #include <h/mh.h>
  */
 
 #include <h/mh.h>

+#include <h/utils.h>

 #include <h/signals.h>
 #include <h/signals.h>

-#include <signal.h>

 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)
 
 #ifndef CYRUS_SASL
 # define SASLminc(a) (a)


@@ -34,13 +32,14 @@
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("client host", -6, CLIESW) \
     X("version", 0, VERSIONSW) \
     X("help", 0, HELPSW) \
     X("client host", -6, CLIESW) \

-    X("server host", -6, SERVSW) \
-    X("snoop", -5, SNOOPSW) \
+    X("server host", 0, SERVSW) \
+    X("snoop", 0, SNOOPSW) \

     X("sasl", SASLminc(4), SASLSW) \
     X("saslmech mechanism", SASLminc(-5), SASLMECHSW) \
     X("user username", SASLminc(-4), USERSW) \
     X("port server port name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \
     X("sasl", SASLminc(4), SASLSW) \
     X("saslmech mechanism", SASLminc(-5), SASLMECHSW) \
     X("user username", SASLminc(-4), USERSW) \
     X("port server port name/number", 4, PORTSW) \
     X("tls", TLSminc(-3), TLSSW) \

+    X("initialtls", TLSminc(-10), INITTLSSW) \

     X("notls", TLSminc(-5), NTLSSW) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 0, MTSSW) \
 
     X("notls", TLSminc(-5), NTLSSW) \
     X("mts smtp|sendmail/smtp|sendmail/pipe", 0, MTSSW) \
 


@@ -56,20 +55,14 @@ DEFINE_SWITCH_ARRAY(WHOM, switches);
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    pid_t child_id;
+    pid_t child_id = OK;

     int i, status, isdf = 0;
     int distsw = 0, vecp = 0;
     char *cp, *dfolder = NULL, *dmsg = NULL;
     char *msg = NULL, **ap, **argp, backup[BUFSIZ];
     char buf[BUFSIZ], **arguments, *vec[MAXARGS];
 
     int i, status, isdf = 0;
     int distsw = 0, vecp = 0;
     char *cp, *dfolder = NULL, *dmsg = NULL;
     char *msg = NULL, **ap, **argp, backup[BUFSIZ];
     char buf[BUFSIZ], **arguments, *vec[MAXARGS];
 

-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* read user profile/context */
-    context_read();
+    if (nmh_init(argv[0], 2)) { return 1; }

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -104,6 +97,7 @@ main (int argc, char **argv)
                case SNOOPSW:
                case SASLSW:
                case TLSSW:
                case SNOOPSW:
                case SASLSW:
                case TLSSW:

+               case INITTLSSW:

                case NTLSSW:
                    vec[vecp++] = --cp;
                    continue;
                case NTLSSW:
                    vec[vecp++] = --cp;
                    continue;


@@ -155,16 +149,13 @@ main (int argc, char **argv)
     if ((cp = context_find ("Aliasfile"))) {
        char *dp = NULL;
 
     if ((cp = context_find ("Aliasfile"))) {
        char *dp = NULL;
 

-       for (ap = brkstring(dp = getcpy(cp), " ", "\n"); ap && *ap; ap++) {
+       for (ap = brkstring(dp = mh_xstrdup(cp), " ", "\n"); ap && *ap; ap++) {

            vec[vecp++] = "-alias";
            vec[vecp++] = *ap;
        }
     }
 
     if (msg == NULL) {
            vec[vecp++] = "-alias";
            vec[vecp++] = *ap;
        }
     }
 
     if (msg == NULL) {

-#ifdef WHATNOW
-       if (dfolder || (cp = getenv ("mhdraft")) == NULL || *cp == '\0')
-#endif /* WHATNOW */

            cp  = getcpy (m_draft (dfolder, dmsg, 1, &isdf));
        msg = vec[vecp++] = cp;
     }
            cp  = getcpy (m_draft (dfolder, dmsg, 1, &isdf));
        msg = vec[vecp++] = cp;
     }


@@ -189,7 +180,8 @@ main (int argc, char **argv)
 
     switch (distsw ? child_id : OK) {
        case NOTOK:
 
     switch (distsw ? child_id : OK) {
        case NOTOK:

-           advise (NULL, "unable to fork, so checking directly...");
+           inform("unable to fork, so checking directly...");
+           /* FALLTHRU */

        case OK:
            execvp (postproc, vec);
            fprintf (stderr, "unable to exec ");
        case OK:
            execvp (postproc, vec);
            fprintf (stderr, "unable to exec ");


@@ -204,7 +196,7 @@ main (int argc, char **argv)
 
            status = pidwait(child_id, OK);
 
 
            status = pidwait(child_id, OK);
 

-           unlink (msg);
+           (void) m_unlink (msg);

            if (rename (backup, msg) == NOTOK)
                adios (msg, "unable to rename %s to", backup);
            done (status);
            if (rename (backup, msg) == NOTOK)
                adios (msg, "unable to rename %s to", backup);
            done (status);