X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/7480dbc14bc90f2d872d434205c0784704213252..b4f2851d:/uip/viamail.c diff --git a/uip/viamail.c b/uip/viamail.c index b4cd5e2b..7c81079d 100644 --- a/uip/viamail.c +++ b/uip/viamail.c @@ -2,8 +2,6 @@ /* * viamail.c -- send multiple files in a MIME message * - * $Id$ - * * 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. @@ -13,58 +11,37 @@ #include #include #include -#include -#include #include #include #include #include -#ifdef HAVE_SYS_WAIT_H -# include -#endif +#define VIAMAIL_SWITCHES \ + X("to mailpath", 0, TOSW) \ + X("from mailpath", 0, FROMSW) \ + X("subject subject", 0, SUBJECTSW) \ + X("parameters arguments", 0, PARAMSW) \ + X("description text", 0, DESCRIPTSW) \ + X("comment text", 0, COMMENTSW) \ + X("delay seconds", 0, DELAYSW) \ + X("verbose", 0, VERBSW) \ + X("noverbose", 0, NVERBSW) \ + X("version", 0, VERSIONSW) \ + X("help", 0, HELPSW) \ + X("debug", -5, DEBUGSW) \ + +#define X(sw, minchars, id) id, +DEFINE_SWITCH_ENUM(VIAMAIL); +#undef X + +#define X(sw, minchars, id) { sw, minchars, id }, +DEFINE_SWITCH_ARRAY(VIAMAIL, switches); +#undef X -static struct swit switches[] = { -#define TOSW 0 - { "to mailpath", 0 }, -#define FROMSW 1 - { "from mailpath", 0 }, -#define SUBJECTSW 2 - { "subject subject", 0 }, -#define PARAMSW 3 - { "parameters arguments", 0 }, -#define DESCRIPTSW 4 - { "description text", 0 }, -#define COMMENTSW 5 - { "comment text", 0 }, -#define DELAYSW 6 - { "delay seconds", 0 }, -#define VERBSW 7 - { "verbose", 0 }, -#define NVERBSW 8 - { "noverbose", 0 }, -#define VERSIONSW 9 - { "version", 0 }, -#define HELPSW 10 - { "help", 0 }, -#define DEBUGSW 11 - { "debug", -5 }, - { NULL, 0 } -}; - -extern int errno; extern int debugsw; extern int splitsw; extern int verbsw; -int ebcdicsw = 0; /* hack for linking purposes */ - -/* mhmisc.c */ -void set_endian (void); - -/* mhoutsbr.c */ -int writeBase64aux (FILE *, FILE *); - /* * static prototypes */ @@ -77,6 +54,7 @@ main (int argc, char **argv) int delay = 0; char *f1 = NULL, *f2 = NULL, *f3 = NULL; char *f4 = NULL, *f5 = NULL, *f7 = NULL; + static char postpath[PATH_MAX]; char *cp, buf[BUFSIZ]; char **argp, **arguments; @@ -104,10 +82,10 @@ main (int argc, char **argv) case HELPSW: snprintf (buf, sizeof(buf), "%s [switches]", invo_name); print_help (buf, switches, 1); - done (1); + done (0); case VERSIONSW: print_version(invo_name); - done (1); + done (0); case TOSW: if (!(f1 = *argp++)) @@ -159,11 +137,37 @@ main (int argc, char **argv) } } - set_endian (); - if (!f1) adios (NULL, "missing -viamail \"mailpath\" switch"); + /* viamail doesn't read the context and postproc isn't always what + we want, such as when running make distcheck. If we have the + absolute path, set postproc to point to post in the same + directory as this executable. + This could be generalized to handle relative paths (by + converting to absolute), to find the full path from PATH given + just the basename, and to squash out ../ but it's only needed + here. viamail is typically called from sendfiles, which + provides the absolute path. + */ + if (argv[0] && argv[0][0] == '/' && + strlen(argv[0]) - 3 < sizeof postpath) { + strncpy (postpath, argv[0], sizeof postpath - 1); + postpath[sizeof postpath - 1] = '\0'; + if ((cp = strrchr (postpath, '/'))) { + struct stat st; + + *(cp + 1) = '\0'; + /* strlen ("post") <= sizeof postpath - (cp - postpath) - 2 + but use strncat just in case the code above changes. */ + strncat (postpath, "post", sizeof postpath - (cp - postpath) - 2); + + if (stat (postpath, &st) == OK) { + postproc = postpath; + } + } + } + via_mail (f1, f2, f3, f4, f5, delay, f7); return 0; /* dead code to satisfy the compiler */ } @@ -177,21 +181,23 @@ static int via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw, char *cmntsw, int delay, char *fromsw) { - int status, vecp = 1; - char tmpfil[BUFSIZ]; - char *vec[MAXARGS]; + int status, vecp; + char tmpfil[BUFSIZ], *program; + char **vec; struct stat st; FILE *fp; + char *tfile = NULL; + char *cp; umask (~m_gmprot ()); - strncpy (tmpfil, m_tmpfil (invo_name), sizeof(tmpfil)); - if ((fp = fopen (tmpfil, "w+")) == NULL) - adios (tmpfil, "unable to open for writing"); - chmod (tmpfil, 0600); + tfile = m_mktemp2(NULL, invo_name, NULL, &fp); + if (tfile == NULL) adios("viamail", "unable to create temporary file"); + chmod(tfile, 0600); + strncpy (tmpfil, tfile, sizeof(tmpfil)); if (!strchr(mailsw, '@')) - mailsw = concat (mailsw, "@", LocalName (), NULL); + mailsw = concat (mailsw, "@", LocalName (0), NULL); fprintf (fp, "To: %s\n", mailsw); if (subjsw) @@ -199,7 +205,7 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw, if (fromsw) { if (!strchr(fromsw, '@')) - fromsw = concat (fromsw, "@", LocalName (), NULL); + fromsw = concat (fromsw, "@", LocalName (0), NULL); fprintf (fp, "From: %s\n", fromsw); } @@ -233,11 +239,18 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw, splitsw = delay; status = 0; - vec[0] = r1bindex (postproc, '/'); + + vec = argsplit(postproc, &program, &vecp); if (verbsw) vec[vecp++] = "-verbose"; - switch (sendsbr (vec, vecp, tmpfil, &st, 0, (char *)0)) { + if ((cp = context_find ("credentials"))) { + /* post doesn't read context so need to pass credentials. */ + vec[vecp++] = "-credentials"; + vec[vecp++] = cp; + } + + switch (sendsbr (vec, vecp, program, tmpfil, &st, 0, (char *)0, 0)) { case DONE: case NOTOK: status++; @@ -249,5 +262,6 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw, fclose (fp); if (unlink (tmpfil) == -1) advise (NULL, "unable to remove temp file %s", tmpfil); - return done (status); + done (status); + return 1; }