X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8bf4e8784aa2a0438ba09b1a0eb9207d3baf6bd9..9291a5f82480f2458e04cb9ea7e6749bc952b308:/uip/whom.c diff --git a/uip/whom.c b/uip/whom.c index 862fc58c..cb49e7f2 100644 --- a/uip/whom.c +++ b/uip/whom.c @@ -1,15 +1,25 @@ - -/* - * 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 * complete copyright information. */ -#include -#include -#include +#include "h/mh.h" +#include "sbr/closefds.h" +#include "sbr/m_draft.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) @@ -34,8 +44,8 @@ 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) \ @@ -57,20 +67,15 @@ DEFINE_SWITCH_ARRAY(WHOM, switches); int main (int argc, char **argv) { - pid_t child_id; - int i, status, isdf = 0; - int distsw = 0, vecp = 0; + pid_t child_id = OK; + 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]; -#ifdef LOCALE - setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); - - /* read user profile/context */ - context_read(); + if (nmh_init(argv[0], true, false)) { return 1; } arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; @@ -78,7 +83,13 @@ main (int argc, char **argv) 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. */ @@ -90,7 +101,7 @@ main (int argc, char **argv) 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); @@ -116,17 +127,17 @@ main (int argc, char **argv) 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 == '-') - 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) - adios (NULL, "only one draft message at a time!"); + die("only one draft message at a time!"); if (!(dmsg = *argp++) || *dmsg == '-') - adios (NULL, "missing argument to %s", argp[-2]); + die("missing argument to %s", argp[-2]); continue; case NDFLDSW: dfolder = NULL; @@ -142,75 +153,64 @@ main (int argc, char **argv) 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) - 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 */ 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) { -#ifdef WHATNOW - if (dfolder || (cp = getenv ("mhdraft")) == NULL || *cp == '\0') -#endif /* WHATNOW */ - cp = getcpy (m_draft (dfolder, dmsg, 1, &isdf)); + cp = mh_xstrdup(m_draft(dfolder, dmsg, 1, &isdf)); 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"; - 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: - advise (NULL, "unable to fork, so checking directly..."); - 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); - - 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); }