Added context_find_prefix().

[nmh] / uip / viamail.c

diff --git a/uip/viamail.c b/uip/viamail.c
index 198413f293d2439672a4a842cb367741c3b00524..050ca0f658e546a6e74bc1f69da6c6b9806ca0d7 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -9,7 +9,6 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <h/signals.h>
 #include <h/md5.h>
 #include <h/mts.h>
 #include <h/tws.h>
@@ -54,18 +53,10 @@ 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;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
-
-    /* foil search of user profile/context */
-    if (context_foil (NULL) == -1)
-       done (1);
+    if (nmh_init(argv[0], 1)) { return 1; }
 
     arguments = getarguments (invo_name, argc, argv, 0);
     argp = arguments;
@@ -140,34 +131,6 @@ main (int argc, char **argv)
     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 */
 }
@@ -226,7 +189,7 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
     if (fflush (fp))
        adios (tmpfil, "error writing to");
 
-    writeBase64aux (stdin, fp);
+    writeBase64aux (stdin, fp, 0);
     if (fflush (fp))
        adios (tmpfil, "error writing to");
 
@@ -250,7 +213,7 @@ via_mail (char *mailsw, char *subjsw, char *parmsw, char *descsw,
        vec[vecp++] = cp;
     }
 
-    switch (sendsbr (vec, vecp, program, tmpfil, &st, 0, (char *)0, 0)) {
+    switch (sendsbr (vec, vecp, program, tmpfil, &st, 0)) {
        case DONE:
        case NOTOK:
            status++;
@@ -260,8 +223,8 @@ 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);
+    if (m_unlink (tmpfil) == -1)
+       advise (tmpfil, "unable to remove temp file %s", tmpfil);
     done (status);
     return 1;
 }