From: David Levine Date: Wed, 19 Sep 2012 03:00:00 +0000 (-0500) Subject: Replaced spost with script that exec's post -mts sendmail/pipe. X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=eabbcb91ae4e824930e9d9c9a206e40f0bdaf61f;p=mmh Replaced spost with script that exec's post -mts sendmail/pipe. --- diff --git a/Makefile.am b/Makefile.am index a8d14b3..4781a80 100644 --- a/Makefile.am +++ b/Makefile.am @@ -132,7 +132,9 @@ bin_SCRIPTS = uip/mhmail etc/sendfiles ## auxexec_PROGRAMS = uip/ap uip/conflict uip/dp uip/fmtdump uip/mhl uip/post \ uip/rcvdist uip/rcvpack uip/rcvstore uip/rcvtty uip/slocal \ - uip/spost uip/viamail uip/mhtest + uip/viamail uip/mhtest + +auxexec_SCRIPTS = uip/spost ## ## Internal libraries that we create as part of the build process @@ -381,8 +383,6 @@ uip_rcvtty_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB) uip_slocal_SOURCES = uip/slocal.c uip/aliasbr.c uip/dropsbr.c uip_slocal_LDADD = $(LDADD) $(NDBM_LIBS) -uip_spost_SOURCES = uip/spost.c uip/aliasbr.c - uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \ uip/annosbr.c uip/distsbr.c diff --git a/configure.ac b/configure.ac index 77f4165..2eb35f2 100644 --- a/configure.ac +++ b/configure.ac @@ -818,5 +818,5 @@ TLS support : ${tls_support} dnl --------------- dnl OUTPUT MAKEFILE dnl --------------- -AC_CONFIG_FILES([Makefile test/common.sh]) +AC_CONFIG_FILES([Makefile uip/spost test/common.sh]) AC_OUTPUT diff --git a/docs/pending-release-notes b/docs/pending-release-notes index 468da54..9550117 100644 --- a/docs/pending-release-notes +++ b/docs/pending-release-notes @@ -47,14 +47,14 @@ OBSOLETE/DEPRECATED FEATURES http://smtpfilter.sourceforge.net/esmtp.html - conflict(8) is deprecated and will be removed from the next release. - mhtest(8) is deprecated and will be removed from the next release. -- spost(8) has been merged into post(8). Its functionality is - enabled by selecting the sendmail/pipe mail transport method in - etc/mts.conf, which in turn can be configured using - --with-mts=sendmail/pipe. The spost -noalias, -backup/-nobackup, +- spost(8) has been merged into post(8). Its functionality is enabled + by selecting the sendmail/pipe mail transport method, described in + the mh-tailor(5) man page. The spost -noalias, -backup/-nobackup, -push/-nopush, and -remove/-noremove switches are not supported by post. Note that spost did not support -whom or Dcc, and neither - does post when using mts: pipe. spost is deprecated and will be - removed from the next release. + does post when using sendmail/pipe. For backward compatibility, + spost has been replaced by a simple shell script that exec's + post -mts sendmail/pipe. --------- BUG FIXES diff --git a/uip/spost.c b/uip/spost.c deleted file mode 100644 index fef583e..0000000 --- a/uip/spost.c +++ /dev/null @@ -1,849 +0,0 @@ - -/* - * spost.c -- feed messages to sendmail - * - * This is a simpler, faster, replacement for "post" for use - * when "sendmail" is the transport system. - * - * 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 -#include -#include -#include -#include - -#define MAX_SM_FIELD 1476 /* < largest hdr field sendmail will accept */ -#define FCCS 10 /* max number of fccs allowed */ - -struct swit switches[] = { -#define FILTSW 0 - { "filter filterfile", 0 }, -#define NFILTSW 1 - { "nofilter", 0 }, -#define REMVSW 2 - { "remove", 0 }, -#define NREMVSW 3 - { "noremove", 0 }, -#define VERBSW 4 - { "verbose", 0 }, -#define NVERBSW 5 - { "noverbose", 0 }, -#define WATCSW 6 - { "watch", 0 }, -#define NWATCSW 7 - { "nowatch", 0 }, -#define BACKSW 8 - { "backup", 0 }, -#define NBACKSW 9 - { "nobackup", 0 }, -#define ALIASW 10 - { "alias aliasfile", 0 }, -#define NALIASW 11 - { "noalias", 0 }, -#define WIDTHSW 12 - { "width columns", 0 }, -#define VERSIONSW 13 - { "version", 0 }, -#define HELPSW 14 - { "help", 0 }, -#define DEBUGSW 15 - { "debug", -5 }, -#define DISTSW 16 - { "dist", -4 }, /* interface from dist */ -#define WHOMSW 17 - { "whom", -4 }, /* interface from whom */ -#define PUSHSW 18 /* fork to sendmail then exit */ - { "push", -4 }, -#define NPUSHSW 19 /* exec sendmail */ - { "nopush", -6 }, -#define LIBSW 20 - { "library directory", -7 }, -#define ANNOSW 21 - { "idanno number", -6 }, - { NULL, 0 } -}; - - -/* flags for headers->flags */ -#define HNOP 0x0000 /* just used to keep .set around */ -#define HBAD 0x0001 /* bad header - don't let it through */ -#define HADR 0x0002 /* header has an address field */ -#define HSUB 0x0004 /* Subject: header */ -#define HTRY 0x0008 /* try to send to addrs on header */ -#define HBCC 0x0010 /* don't output this header */ -/* #define HMNG 0x0020 */ /* munge this header */ -#define HNGR 0x0040 /* no groups allowed in this header */ -#define HFCC 0x0080 /* FCC: type header */ -#define HNIL 0x0100 /* okay for this header not to have addrs */ -#define HIGN 0x0200 /* ignore this header */ - -/* flags for headers->set */ -#define MFRM 0x0001 /* we've seen a From: */ -#define MDAT 0x0002 /* we've seen a Date: */ -#define MRFM 0x0004 /* we've seen a Resent-From: */ -#define MVIS 0x0008 /* we've seen sighted addrs */ -#define MINV 0x0010 /* we've seen blind addrs */ -#define MRDT 0x0020 /* we've seen a Resent-Date: */ - -struct headers { - char *value; - unsigned int flags; - unsigned int set; -}; - - -static struct headers NHeaders[] = { - { "Return-Path", HBAD, 0 }, - { "Received", HBAD, 0 }, - { "Reply-To", HADR|HNGR, 0 }, - { "From", HADR|HNGR, MFRM }, - { "Sender", HADR|HBAD, 0 }, - { "Date", HNOP, MDAT }, - { "Subject", HSUB, 0 }, - { "To", HADR|HTRY, MVIS }, - { "cc", HADR|HTRY, MVIS }, - { "Bcc", HADR|HTRY|HBCC|HNIL, MINV }, - { "Message-Id", HBAD, 0 }, - { "Fcc", HFCC, 0 }, - { "Envelope-From",HIGN, 0 }, - { NULL, 0, 0 } -}; - -static struct headers RHeaders[] = { - { "Resent-Reply-To", HADR|HNGR, 0 }, - { "Resent-From", HADR|HNGR, MRFM }, - { "Resent-Sender", HADR|HBAD, 0 }, - { "Resent-Date", HNOP, MRDT }, - { "Resent-Subject", HSUB, 0 }, - { "Resent-To", HADR|HTRY, MVIS }, - { "Resent-cc", HADR|HTRY, MVIS }, - { "Resent-Bcc", HADR|HTRY|HBCC, MINV }, - { "Resent-Message-Id", HBAD, 0 }, - { "Resent-Fcc", HFCC, 0 }, - { "Reply-To", HADR, 0 }, - { "Fcc", HIGN, 0 }, - { "Envelope-From", HIGN, 0 }, - { NULL, 0, 0 } -}; - - -static short fccind = 0; /* index into fccfold[] */ - -static int badmsg = 0; /* message has bad semantics */ -static int verbose = 0; /* spell it out */ -static int debug = 0; /* debugging post */ -static int rmflg = 1; /* remove temporary file when done */ -static int watch = 0; /* watch the delivery process */ -static int backflg = 0; /* rename input file as *.bak when done */ -static int whomflg = 0; /* if just checking addresses */ -static int pushflg = 0; /* if going to fork to sendmail */ -static int aliasflg = -1; /* if going to process aliases */ -static int outputlinelen=72; - -static unsigned msgflags = 0; /* what we've seen */ - -static enum { - normal, resent -} msgstate = normal; - -static char tmpfil[] = "/tmp/pstXXXXXX"; - -static char from[BUFSIZ]; /* my network address */ -static char signature[BUFSIZ]; /* my signature */ -static char *filter = NULL; /* the filter for BCC'ing */ -static char *subject = NULL; /* the subject field for BCC'ing */ -static char *fccfold[FCCS]; /* foldernames for FCC'ing */ - -static struct headers *hdrtab; /* table for the message we're doing */ -static FILE *out; /* output (temp) file */ - -extern char *sendmail; - -/* - * external prototypes - */ -extern char *getfullname (void); -extern char *getusername (void); - -/* - * static prototypes - */ -static void putfmt (char *, char *, FILE *); -static void start_headers (void); -static void finish_headers (FILE *); -static int get_header (char *, struct headers *); -static void putadr (char *, struct mailname *); -static int putone (char *, int, int); -static void insert_fcc (struct headers *, unsigned char *); -static void file (char *); -static void fcc (char *, char *); - -#if 0 -static void die (char *, char *, ...); -static void make_bcc_file (void); -#endif - - -int -main (int argc, char **argv) -{ - int state, i, pid, compnum; - char *cp, *msg = NULL, **argp, **arguments; - char *sargv[16], buf[BUFSIZ], name[NAMESZ]; - FILE *in; - -#ifdef LOCALE - setlocale(LC_ALL, ""); -#endif - invo_name = r1bindex (argv[0], '/'); - - /* foil search of user profile/context */ - if (context_foil (NULL) == -1) - done (1); - - mts_init (invo_name); - arguments = getarguments (invo_name, argc, argv, 0); - argp = arguments; - - while ((cp = *argp++)) { - if (*cp == '-') { - switch (smatch (++cp, switches)) { - case AMBIGSW: - ambigsw (cp, switches); - done (1); - case UNKWNSW: - adios (NULL, "-%s unknown", cp); - - case HELPSW: - snprintf (buf, sizeof(buf), "%s [switches] file", invo_name); - print_help (buf, switches, 1); - done (0); - case VERSIONSW: - print_version(invo_name); - done (0); - - case DEBUGSW: - debug++; - continue; - - case DISTSW: - msgstate = resent; - continue; - - case WHOMSW: - whomflg++; - continue; - - case FILTSW: - if (!(filter = *argp++) || *filter == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - case NFILTSW: - filter = NULL; - continue; - - case REMVSW: - rmflg++; - continue; - case NREMVSW: - rmflg = 0; - continue; - - case BACKSW: - backflg++; - continue; - case NBACKSW: - backflg = 0; - continue; - - case VERBSW: - verbose++; - continue; - case NVERBSW: - verbose = 0; - continue; - - case WATCSW: - watch++; - continue; - case NWATCSW: - watch = 0; - continue; - - case PUSHSW: - pushflg++; - continue; - case NPUSHSW: - pushflg = 0; - continue; - - case ALIASW: - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - if (aliasflg < 0) - alias (AliasFile);/* load default aka's */ - aliasflg = 1; - if ((state = alias(cp)) != AK_OK) - adios (NULL, "aliasing error in file %s - %s", - cp, akerror(state) ); - continue; - case NALIASW: - aliasflg = 0; - continue; - - case WIDTHSW: - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - outputlinelen = atoi (cp); - if (outputlinelen <= 10) - outputlinelen = 72; - continue; - - case LIBSW: - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - /* create a minimal context */ - if (context_foil (cp) == -1) - done(1); - continue; - - case ANNOSW: - /* -idanno switch ignored */ - if (!(cp = *argp++) || *cp == '-') - adios (NULL, "missing argument to %s", argp[-2]); - continue; - } - } - if (msg) - adios (NULL, "only one message at a time!"); - else - msg = cp; - } - - if (aliasflg < 0) - alias (AliasFile); /* load default aka's */ - - if (!msg) - adios (NULL, "usage: %s [switches] file", invo_name); - - if ((in = fopen (msg, "r")) == NULL) - adios (msg, "unable to open"); - - start_headers (); - if (debug) { - verbose++; - out = stdout; - } - else { - if ((out = fdopen( mkstemp (tmpfil), "w" )) == NULL ) - adios (tmpfil, "unable to create"); - } - - hdrtab = (msgstate == normal) ? NHeaders : RHeaders; - - for (compnum = 1, state = FLD;;) { - switch (state = m_getfld (state, name, buf, sizeof(buf), in)) { - case FLD: - compnum++; - putfmt (name, buf, out); - continue; - - case FLDPLUS: - compnum++; - cp = add (buf, cp); - while (state == FLDPLUS) { - state = m_getfld (state, name, buf, sizeof(buf), in); - cp = add (buf, cp); - } - putfmt (name, cp, out); - free (cp); - continue; - - case BODY: - finish_headers (out); - fprintf (out, "\n%s", buf); - if(whomflg == 0) - while (state == BODY) { - state = m_getfld (state, name, buf, sizeof(buf), in); - fputs (buf, out); - } - break; - - case FILEEOF: - finish_headers (out); - break; - - case LENERR: - case FMTERR: - adios (NULL, "message format error in component #%d", - compnum); - - default: - adios (NULL, "getfld() returned %d", state); - } - break; - } - - fclose (in); - if (backflg && !whomflg) { - strncpy (buf, m_backup (msg), sizeof(buf)); - if (rename (msg, buf) == NOTOK) - advise (buf, "unable to rename %s to", msg); - } - - if (debug) { - done (0); - } - else - fclose (out); - - file (tmpfil); - - /* - * re-open the temp file, unlink it and exec sendmail, giving it - * the msg temp file as std in. - */ - if ( freopen( tmpfil, "r", stdin) == NULL) - adios (tmpfil, "can't reopen for sendmail"); - if (rmflg) - unlink (tmpfil); - - argp = sargv; - *argp++ = "send-mail"; - *argp++ = "-m"; /* send to me too */ - *argp++ = "-t"; /* read msg for recipients */ - *argp++ = "-i"; /* don't stop on "." */ - if (whomflg) - *argp++ = "-bv"; - if (watch || verbose) - *argp++ = "-v"; - *argp = NULL; - - if (pushflg && !(watch || verbose)) { - /* fork to a child to run sendmail */ - for (i=0; (pid = vfork()) == NOTOK && i < 5; i++) - sleep(5); - switch (pid) { - case NOTOK: - fprintf (verbose ? stdout : stderr, "%s: can't fork to %s\n", - invo_name, sendmail); - exit(-1); - case OK: - /* we're the child .. */ - break; - default: - exit(0); - } - } - execv ( sendmail, sargv); - adios ( sendmail, "can't exec"); - return 0; /* dead code to satisfy the compiler */ -} - -/* DRAFT GENERATION */ - -static void -putfmt (char *name, char *str, FILE *out) -{ - int i; - char *cp, *pp; - struct headers *hdr; - - while (*str == ' ' || *str == '\t') - str++; - - if ((i = get_header (name, hdrtab)) == NOTOK) { - fprintf (out, "%s: %s", name, str); - return; - } - - hdr = &hdrtab[i]; - if (hdr->flags & HIGN) - return; - if (hdr->flags & HBAD) { - advise (NULL, "illegal header line -- %s:", name); - badmsg++; - return; - } - msgflags |= hdr->set; - - if (hdr->flags & HSUB) - subject = subject ? add (str, add ("\t", subject)) : getcpy (str); - - if (hdr->flags & HFCC) { - if ((cp = strrchr(str, '\n'))) - *cp = 0; - for (cp = pp = str; (cp = strchr(pp, ',')); pp = cp) { - *cp++ = 0; - insert_fcc (hdr, pp); - } - insert_fcc (hdr, pp); - return; - } - -#ifdef notdef - if (hdr->flags & HBCC) { - insert_bcc(str); - return; - } -#endif /* notdef */ - - if (*str != '\n' && *str != '\0') { - if (aliasflg && hdr->flags & HTRY) { - /* this header contains address(es) that we have to do - * alias expansion on. Because of the saved state in - * getname we have to put all the addresses into a list. - * We then let putadr munch on that list, possibly - * expanding aliases. - */ - register struct mailname *f = 0; - register struct mailname *mp = 0; - - while ((cp = getname(str))) { - mp = getm( cp, NULL, 0, AD_HOST, NULL); - if (f == 0) { - f = mp; - mp->m_next = mp; - } else { - mp->m_next = f->m_next; - f->m_next = mp; - f = mp; - } - } - f = mp->m_next; mp->m_next = 0; - putadr( name, f ); - } else { - /* The author(s) of spost decided that alias substitution wasn't - necessary for the non-HTRY headers. Unfortunately, one of those - headers is "From:", and having alias substitution work on that is - extremely useful for someone with a lot of POP3 email accounts or - aliases. post supports aliasing of "From:"... - - Since "From:"-processing is incompletely implemented in this - unsupported and undocumented spost backend, I'm not going to take - the time to implement my new draft-From:-based email address - masquerading. If I do ever implement it here, I'd almost - certainly want to implement "From:" line alias processing as - well. -- Dan Harkless */ - fprintf (out, "%s: %s", name, str ); - } - } -} - - -static void -start_headers (void) -{ - char *cp; - char sigbuf[BUFSIZ]; - - strncpy(from, getusername(), sizeof(from)); - - if ((cp = getfullname ()) && *cp) { - strncpy (sigbuf, cp, sizeof(sigbuf)); - snprintf (signature, sizeof(signature), "%s <%s>", sigbuf, from); - } - else - snprintf (signature, sizeof(signature), "%s", from); -} - - -static void -finish_headers (FILE *out) -{ - switch (msgstate) { - case normal: - if (!(msgflags & MDAT)) - fprintf (out, "Date: %s\n", dtimenow (0)); - - if (!(msgflags & MFRM)) - fprintf (out, "From: %s\n", signature); - -#ifdef notdef - if (!(msgflags & MVIS)) - fprintf (out, "Bcc: Blind Distribution List: ;\n"); -#endif /* notdef */ - break; - - case resent: - if (!(msgflags & MRDT)) - fprintf (out, "Resent-Date: %s\n", dtimenow(0)); - if (!(msgflags & MRFM)) - /* Construct a Resent-From: header. */ - fprintf (out, "Resent-From: %s\n", signature); -#ifdef notdef - if (!(msgflags & MVIS)) - fprintf (out, "Resent-Bcc: Blind Re-Distribution List: ;\n"); -#endif /* notdef */ - break; - } - - if (badmsg) - adios (NULL, "re-format message and try again"); -} - - -static int -get_header (char *header, struct headers *table) -{ - struct headers *h; - - for (h = table; h->value; h++) - if (!mh_strcasecmp (header, h->value)) - return (h - table); - - return NOTOK; -} - - -/* - * output the address list for header "name". The address list - * is a linked list of mailname structs. "nl" points to the head - * of the list. Alias substitution should be done on nl. - */ -static void -putadr (char *name, struct mailname *nl) -{ - register struct mailname *mp, *mp2; - register int linepos; - register char *cp; - int namelen; - - fprintf (out, "%s: ", name); - namelen = strlen(name) + 2; - linepos = namelen; - - for (mp = nl; mp; ) { - if (linepos > MAX_SM_FIELD) { - fprintf (out, "\n%s: ", name); - linepos = namelen; - } - if (mp->m_nohost) { - /* a local name - see if it's an alias */ - cp = akvalue(mp->m_mbox); - if (cp == mp->m_mbox) - /* wasn't an alias - use what the user typed */ - linepos = putone( mp->m_text, linepos, namelen ); - else - /* an alias - expand it */ - while ((cp = getname(cp))) { - if (linepos > MAX_SM_FIELD) { - fprintf (out, "\n%s: ", name); - linepos = namelen; - } - mp2 = getm( cp, NULL, 0, AD_HOST, NULL); - if (akvisible()) { - mp2->m_pers = getcpy(mp->m_mbox); - linepos = putone( adrformat(mp2), linepos, namelen ); - } else { - linepos = putone( mp2->m_text, linepos, namelen ); - } - mnfree( mp2 ); - } - } else { - /* not a local name - use what the user typed */ - linepos = putone( mp->m_text, linepos, namelen ); - } - mp2 = mp; - mp = mp->m_next; - mnfree( mp2 ); - } - putc( '\n', out ); -} - -static int -putone (char *adr, int pos, int indent) -{ - register int len; - static int linepos; - - len = strlen( adr ); - if (pos == indent) - linepos = pos; - else if ( linepos+len > outputlinelen ) { - fprintf ( out, ",\n%*s", indent, ""); - linepos = indent; - pos += indent + 2; - } - else { - fputs( ", ", out ); - linepos += 2; - pos += 2; - } - fputs( adr, out ); - - linepos += len; - return (pos+len); -} - - -static void -insert_fcc (struct headers *hdr, unsigned char *pp) -{ - unsigned char *cp; - - for (cp = pp; isspace (*cp); cp++) - continue; - for (pp += strlen (pp) - 1; pp > cp && isspace (*pp); pp--) - continue; - if (pp >= cp) - *++pp = 0; - if (*cp == 0) - return; - - if (fccind >= FCCS) - adios (NULL, "too many %ss", hdr->value); - fccfold[fccind++] = getcpy (cp); -} - -#if 0 -/* BCC GENERATION */ - -static void -make_bcc_file (void) -{ - pid_t child_id; - int fd, i, status; - char *vec[6]; - FILE * in, *out; - - fd = mkstemp(bccfil); - if (fd == -1 || (out = fdopen(fd, "w")) == NULL) - adios (bccfil, "unable to create"); - chmod (bccfil, 0600); - - fprintf (out, "Date: %s\n", dtimenow (0)); - if (!(msgflags & MFRM)) - /* Construct a From: header. */ - fprintf (out, "From: %s\n", signature); - if (subject) - fprintf (out, "Subject: %s", subject); - fprintf (out, "BCC:\n\n------- Blind-Carbon-Copy\n\n"); - fflush (out); - - if (filter == NULL) { - if ((fd = open (tmpfil, O_RDONLY)) == NOTOK) - adios (NULL, "unable to re-open"); - cpydgst (fd, fileno (out), tmpfil, bccfil); - close (fd); - } - else { - vec[0] = r1bindex (mhlproc, '/'); - - for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++) - sleep (5); - switch (child_id) { - case NOTOK: - adios ("vfork", "unable to"); - - case OK: - dup2 (fileno (out), 1); - - i = 1; - vec[i++] = "-forward"; - vec[i++] = "-form"; - vec[i++] = filter; - vec[i++] = tmpfil; - vec[i] = NULL; - - execvp (mhlproc, vec); - adios (mhlproc, "unable to exec"); - - default: - if (status = pidwait(child_id, OK)) - admonish (NULL, "%s lost (status=0%o)", vec[0], status); - break; - } - } - - fseek (out, 0L, SEEK_END); - fprintf (out, "\n------- End of Blind-Carbon-Copy\n"); - fclose (out); -} -#endif /* if 0 */ - -/* FCC INTERACTION */ - -static void -file (char *path) -{ - int i; - - if (fccind == 0) - return; - - for (i = 0; i < fccind; i++) - if (whomflg) - printf ("Fcc: %s\n", fccfold[i]); - else - fcc (path, fccfold[i]); -} - - -static void -fcc (char *file, char *folder) -{ - pid_t child_id; - int i, status; - char fold[BUFSIZ]; - - if (verbose) - printf ("%sFcc: %s\n", msgstate == resent ? "Resent-" : "", folder); - fflush (stdout); - - for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++) - sleep (5); - switch (child_id) { - case NOTOK: - if (!verbose) - fprintf (stderr, " %sFcc %s: ", - msgstate == resent ? "Resent-" : "", folder); - fprintf (verbose ? stdout : stderr, "no forks, so not ok\n"); - break; - - case OK: - snprintf (fold, sizeof(fold), "%s%s", - *folder == '+' || *folder == '@' ? "" : "+", folder); - execlp (fileproc, r1bindex (fileproc, '/'), - "-link", "-file", file, fold, NULL); - _exit (-1); - - default: - if ((status = pidwait(child_id, OK))) { - if (!verbose) - fprintf (stderr, " %sFcc %s: ", - msgstate == resent ? "Resent-" : "", folder); - fprintf (verbose ? stdout : stderr, - " errored (0%o)\n", status); - } - } - - fflush (stdout); -} - - -#if 0 - -/* - * TERMINATION - */ - -static void -die (char *what, char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - advertise (what, NULL, fmt, ap); - va_end(ap); - - done (1); -} -#endif diff --git a/uip/spost.in b/uip/spost.in new file mode 100644 index 0000000..e5ee130 --- /dev/null +++ b/uip/spost.in @@ -0,0 +1,13 @@ +#! /bin/sh +# +# spost -- delivers a message to local sendmail using its -t option +# +# This code is Copyright (c) 2012, by the authors of nmh. See the +# COPYRIGHT file in the root directory of the nmh distribution for +# complete copyright information. +# +# Emulates old spost(8) using post(8). + +prefix='@prefix@' +exec_prefix="@exec_prefix@" +exec "@libdir@/post" -mts sendmail/pipe "$@"