fdcompare.c: Move interface to own file.

[nmh] / uip / whom.c

diff --git a/uip/whom.c b/uip/whom.c
index efa74c63d0a1fd6555f1db3cb3499b3c6453782b..56ae6b46f636dc1c120820649b3323b48e6fcc46 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -5,11 +5,19 @@
  * complete copyright information.
  */
 
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/utils.h>
-#include <h/signals.h>
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "h/mh.h"
+#include "sbr/context_find.h"
+#include "sbr/brkstring.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "h/signals.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"

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


@@ -58,13 +66,14 @@ int
 main (int argc, char **argv)
 {
     pid_t child_id = OK;
 main (int argc, char **argv)
 {
     pid_t child_id = OK;

-    int i, status, isdf = 0;
-    int distsw = 0, vecp = 0;
+    int status, isdf = 0;
+    int vecp = 0;
+    bool distsw;

     char *cp, *dfolder = NULL, *dmsg = NULL;
     char *msg = NULL, **ap, **argp, backup[BUFSIZ];
     char buf[BUFSIZ], **arguments, *vec[MAXARGS];
 
     char *cp, *dfolder = NULL, *dmsg = NULL;
     char *msg = NULL, **ap, **argp, backup[BUFSIZ];
     char buf[BUFSIZ], **arguments, *vec[MAXARGS];
 

-    if (nmh_init(argv[0], 2)) { return 1; }
+    if (nmh_init(argv[0], true, false)) { return 1; }

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


@@ -72,7 +81,13 @@ main (int argc, char **argv)
     vec[vecp++] = invo_name;
     vec[vecp++] = "-whom";
     vec[vecp++] = "-library";
     vec[vecp++] = invo_name;
     vec[vecp++] = "-whom";
     vec[vecp++] = "-library";

-    vec[vecp++] = getcpy (m_maildir (""));
+    vec[vecp++] = mh_xstrdup(m_maildir(""));
+
+    if ((cp = context_find ("credentials"))) {
+       /* post doesn't read context so need to pass credentials. */
+       vec[vecp++] = "-credentials";
+       vec[vecp++] = cp;
+    }

 
     /* Don't need to feed fileproc or mhlproc to post because
        it doesn't use them when used for whom. */
 
     /* Don't need to feed fileproc or mhlproc to post because
        it doesn't use them when used for whom. */


@@ -84,7 +99,7 @@ main (int argc, char **argv)
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 

-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);

 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [switches] [file]", invo_name);


@@ -110,17 +125,17 @@ main (int argc, char **argv)
 
                case DFOLDSW: 
                    if (dfolder)
 
                case DFOLDSW: 
                    if (dfolder)

-                       adios (NULL, "only one draft folder at a time!");
+                       die("only one draft folder at a time!");

                    if (!(cp = *argp++) || *cp == '-')
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    dfolder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp,
                            *cp != '@' ? TFOLDER : TSUBCWF);
                    continue;
                case DMSGSW: 
                    if (dmsg)
                    dfolder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp,
                            *cp != '@' ? TFOLDER : TSUBCWF);
                    continue;
                case DMSGSW: 
                    if (dmsg)

-                       adios (NULL, "only one draft message at a time!");
+                       die("only one draft message at a time!");

                    if (!(dmsg = *argp++) || *dmsg == '-')
                    if (!(dmsg = *argp++) || *dmsg == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    continue;
                case NDFLDSW: 
                    dfolder = NULL;
                    continue;
                case NDFLDSW: 
                    dfolder = NULL;


@@ -136,15 +151,14 @@ main (int argc, char **argv)
                case MTSSW:
                    vec[vecp++] = --cp;
                    if (!(cp = *argp++) || *cp == '-')
                case MTSSW:
                    vec[vecp++] = --cp;
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    vec[vecp++] = cp;
                    continue;
            }
        }
        if (msg)
                    vec[vecp++] = cp;
                    continue;
            }
        }
        if (msg)

-           adios (NULL, "only one draft at a time!");
-       else
-           vec[vecp++] = msg = cp;
+           die("only one draft at a time!");
+        vec[vecp++] = msg = cp;

     }
 
     /* allow Aliasfile: profile entry */
     }
 
     /* allow Aliasfile: profile entry */


@@ -158,51 +172,43 @@ main (int argc, char **argv)
     }
 
     if (msg == NULL) {
     }
 
     if (msg == NULL) {

-           cp  = getcpy (m_draft (dfolder, dmsg, 1, &isdf));
+           cp  = mh_xstrdup(m_draft(dfolder, dmsg, 1, &isdf));

        msg = vec[vecp++] = cp;
     }
        msg = vec[vecp++] = cp;
     }

-    if ((cp = getenv ("mhdist"))
-           && *cp
-           && (distsw = atoi (cp))
-           && (cp = getenv ("mhaltmsg"))
-           && *cp) {
+
+    distsw = (cp = getenv("mhdist")) && *cp && atoi(cp) &&
+        (cp = getenv("mhaltmsg")) && *cp;
+    if (distsw) {

        if (distout (msg, cp, backup) == NOTOK)
            done (1);
        vec[vecp++] = "-dist";
        if (distout (msg, cp, backup) == NOTOK)
            done (1);
        vec[vecp++] = "-dist";

-       distsw++;

     }
     vec[vecp] = NULL;
 
     closefds (3);
 
     if (distsw) {
     }
     vec[vecp] = NULL;
 
     closefds (3);
 
     if (distsw) {

-       for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
-           sleep (5);
-    }
-
-    switch (distsw ? child_id : OK) {
-       case NOTOK:
-           inform("unable to fork, so checking directly...");
-           /* FALLTHRU */
-       case OK:
-           execvp (postproc, vec);
-           fprintf (stderr, "unable to exec ");
-           perror (postproc);
-           _exit (-1);
-
-       default:
-           SIGNAL (SIGHUP, SIG_IGN);
-           SIGNAL (SIGINT, SIG_IGN);
-           SIGNAL (SIGQUIT, SIG_IGN);
-           SIGNAL (SIGTERM, SIG_IGN);
-
-           status = pidwait(child_id, OK);
-
-           (void) m_unlink (msg);
-           if (rename (backup, msg) == NOTOK)
-               adios (msg, "unable to rename %s to", backup);
-           done (status);
+        if ((child_id = fork()) == -1)
+            adios("fork", "failed:");
+
+        if (child_id) {
+            SIGNAL (SIGHUP, SIG_IGN);
+            SIGNAL (SIGINT, SIG_IGN);
+            SIGNAL (SIGQUIT, SIG_IGN);
+            SIGNAL (SIGTERM, SIG_IGN);
+
+            status = pidwait(child_id, OK);
+
+            (void) m_unlink (msg);
+            if (rename (backup, msg) == NOTOK)
+                adios (msg, "unable to rename %s to", backup);
+            done (status);
+        }

     }
 
     }
 

-    return 0;  /* dead code to satisfy the compiler */
+    /* Either the child, or no fork occurred. */
+    execvp (postproc, vec);
+    fprintf (stderr, "unable to exec ");
+    perror (postproc);
+    _exit(1);

 }
 }