X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0bfb53a23531bea3aaeadcd1a6f6c372eef96612..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/rcvdist.c

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 33890d5f..a8231e91 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -42,23 +42,24 @@ int
 main (int argc, char **argv)
 {
     pid_t child_id;
-    int i, vecp = 1;
-    char *addrs = NULL, *cp, *form = NULL, buf[BUFSIZ];
-    char **argp, **arguments, *vec[MAXARGS];
+    int i, vecp;
+    char *addrs = NULL, *cp, *form = NULL, buf[BUFSIZ], *program;
+    char **argp, **arguments, **vec;
     FILE *fp;
     char *tfile = NULL;
 
+    if (nmh_init(argv[0], 2)) { return 1; }
+
     done=unlink_done;
 
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    /*
+     * Configure this now, since any unknown switches to rcvdist get
+     * sent to postproc
+     */
 
-    /* read user profile/context */
-    context_read();
+    vec = argsplit(postproc, &program, &vecp);
 
-    mts_init (invo_name);
+    mts_init ();
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
@@ -88,7 +89,7 @@ main (int argc, char **argv)
 		    continue;
 	    }
 	}
-	addrs = addrs ? add (cp, add (", ", addrs)) : getcpy (cp);
+	addrs = addrs ? add (cp, add (", ", addrs)) : mh_xstrdup(cp);
     }
 
     if (addrs == NULL)
@@ -97,15 +98,17 @@ main (int argc, char **argv)
 
     umask (~m_gmprot ());
 
-    tfile = m_mktemp2(NULL, invo_name, NULL, &fp);
-    if (tfile == NULL) adios("rcvdist", "unable to create temporary file");
+    if ((tfile = m_mktemp2(NULL, invo_name, NULL, &fp)) == NULL) {
+	adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+    }
     strncpy (tmpfil, tfile, sizeof(tmpfil));
 
     cpydata (fileno (stdin), fileno (fp), "message", tmpfil);
     fseek (fp, 0L, SEEK_SET);
 
-    tfile = m_mktemp2(NULL, invo_name, NULL, NULL);
-    if (tfile == NULL) adios("forw", "unable to create temporary file");
+    if ((tfile = m_mktemp2(NULL, invo_name, NULL, NULL)) == NULL) {
+	adios(NULL, "unable to create temporary file in %s", get_temp_dir());
+    }
     strncpy (drft, tfile, sizeof(tmpfil));
 
     rcvdistout (fp, form, addrs);
@@ -114,13 +117,12 @@ main (int argc, char **argv)
     if (distout (drft, tmpfil, backup) == NOTOK)
 	done (1);
 
-    vec[0] = r1bindex (postproc, '/');
     vec[vecp++] = "-dist";
-    vec[vecp++] = drft;
     if ((cp = context_find ("mhlproc"))) {
       vec[vecp++] = "-mhlproc";
       vec[vecp++] = cp;
     }
+    vec[vecp++] = drft;
     vec[vecp] = NULL;
 
     for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
@@ -129,7 +131,7 @@ main (int argc, char **argv)
 	case NOTOK: 
 	    admonish (NULL, "unable to fork");/* fall */
 	case OK: 
-	    execvp (postproc, vec);
+	    execvp (program, vec);
 	    fprintf (stderr, "unable to exec ");
 	    perror (postproc);
 	    _exit (1);
@@ -171,10 +173,11 @@ static char *addrcomps[] = {
 static void
 rcvdistout (FILE *inb, char *form, char *addrs)
 {
-    register int char_read = 0, format_len, i, state;
-    register char **ap;
-    char *cp, *scanl, name[NAMESZ], tmpbuf[SBUFSIZ];
-    register struct comp *cptr;
+    int char_read = 0, format_len, i, state;
+    char **ap;
+    char *cp, name[NAMESZ], tmpbuf[SBUFSIZ];
+    charstring_t scanl;
+    struct comp *cptr;
     FILE *out;
     m_getfld_state_t gstate = 0;
 
@@ -232,17 +235,17 @@ finished: ;
     m_getfld_state_destroy (&gstate);
 
     i = format_len + char_read + 256;
-    scanl = mh_xmalloc ((size_t) i + 2);
+    scanl = charstring_create (i + 2);
     dat[0] = dat[1] = dat[2] = dat[4] = 0;
     dat[3] = outputlinelen;
-    fmt_scan (fmt, scanl, i + 1, i, dat);
-    fputs (scanl, out);
+    fmt_scan (fmt, scanl, i, dat, NULL);
+    fputs (charstring_buffer (scanl), out);
 
     if (ferror (out))
 	adios (drft, "error writing");
     fclose (out);
 
-    free (scanl);
+    charstring_free (scanl);
     fmt_free(fmt, 1);
 }
 
@@ -251,11 +254,11 @@ static void
 unlink_done (int status)
 {
     if (backup[0])
-	unlink (backup);
+	(void) m_unlink (backup);
     if (drft[0])
-	unlink (drft);
+	(void) m_unlink (drft);
     if (tmpfil[0])
-	unlink (tmpfil);
+	(void) m_unlink (tmpfil);
 
     exit (status ? RCV_MBX : RCV_MOK);
 }